Add latest changes from gitlab-org/gitlab@master

2 files changed, 17 insertions, 29 deletions

diff --git a/app/presenters/ml/model_presenter.rb b/app/presenters/ml/model_presenter.rb
new file mode 100644
index 00000000000..1317a13351b
--- /dev/null
+++ b/app/presenters/ml/model_presenter.rb
@@ -0,0 +1,17 @@
+# frozen_string_literal: true
+
+module Ml
+  class ModelPresenter < Gitlab::View::Presenter::Delegated
+    presents ::Ml::Model, as: :model
+
+    def latest_version_name
+      model.latest_version&.version
+    end
+
+    def latest_package_path
+      return unless model.latest_version&.package_id.present?
+
+      Gitlab::Routing.url_helpers.project_package_path(model.project, model.latest_version.package_id)
+    end
+  end
+end
diff --git a/app/presenters/ml/models_index_presenter.rb b/app/presenters/ml/models_index_presenter.rb
deleted file mode 100644
index c61f87fc4af..00000000000
--- a/app/presenters/ml/models_index_presenter.rb
+++ /dev/null
@@ -1,29 +0,0 @@
-# frozen_string_literal: true
-
-module Ml
-  class ModelsIndexPresenter
-    def initialize(models)
-      @models = models
-    end
-
-    def present
-      data = @models.map do |m|
-        {
-          name: m.name,
-          version: m.latest_version&.version,
-          path: package_path(m)
-        }
-      end
-
-      Gitlab::Json.generate({ models: data })
-    end
-
-    private
-
-    def package_path(model)
-      return unless model.latest_version&.package.present?
-
-      Gitlab::Routing.url_helpers.project_package_path(model.project, model.latest_version.package_id)
-    end
-  end
-end