3 files changed, 32 insertions, 1 deletions
diff --git a/app/graphql/types/design_management/design_collection_copy_state_enum.rb b/app/graphql/types/design_management/design_collection_copy_state_enum.rb
new file mode 100644
index 00000000000..7e7303c50ef
--- /dev/null
+++ b/app/graphql/types/design_management/design_collection_copy_state_enum.rb
@@ -0,0 +1,27 @@
+# frozen_string_literal: true
+
+module Types
+  module DesignManagement
+    class DesignCollectionCopyStateEnum < BaseEnum
+      graphql_name 'DesignCollectionCopyState'
+      description 'Copy state of a DesignCollection'
+
+      DESCRIPTION_VARIANTS = {
+        in_progress: 'is being copied',
+        error: 'encountered an error during a copy',
+        ready: 'has no copy in progress'
+      }.freeze
+
+      def self.description_variant(copy_state)
+        DESCRIPTION_VARIANTS[copy_state.to_sym] ||
+          (raise ArgumentError, "Unknown copy state: #{copy_state}")
+      end
+
+      ::DesignManagement::DesignCollection.state_machines[:copy_state].states.keys.each do |copy_state|
+        value copy_state.upcase,
+              value: copy_state.to_s,
+              description: "The DesignCollection #{description_variant(copy_state)}"
+      end
+    end
+  end
+end
diff --git a/app/graphql/types/design_management/design_collection_type.rb b/app/graphql/types/design_management/design_collection_type.rb
index 904fb270e11..9af1f4db425 100644
--- a/app/graphql/types/design_management/design_collection_type.rb
+++ b/app/graphql/types/design_management/design_collection_type.rb
@@ -39,6 +39,10 @@ module Types
             null: true,
             resolver: ::Resolvers::DesignManagement::DesignResolver,
             description: 'Find a specific design'
+
+      field :copy_state, ::Types::DesignManagement::DesignCollectionCopyStateEnum,
+            null: true,
+            description: 'Copy state of the design collection'
     end
   end
 end
diff --git a/app/graphql/types/design_management/design_type.rb b/app/graphql/types/design_management/design_type.rb
index 4e11a7aaf09..bab22015dc4 100644
--- a/app/graphql/types/design_management/design_type.rb
+++ b/app/graphql/types/design_management/design_type.rb
@@ -30,7 +30,7 @@ module Types
         # most recent `Version` for an issue
         Gitlab::SafeRequestStore.fetch([request_cache_base_key, 'stateful_version', object.issue_id, version_gid]) do
           if version_gid
-            GitlabSchema.object_from_id(version_gid)&.sync
+            GitlabSchema.object_from_id(version_gid, expected_type: ::DesignManagement::Version)&.sync
           else
             object.issue.design_versions.most_recent
           end