From e8995a0b25f2c018a7c9a1ccadd4274235297801 Mon Sep 17 00:00:00 2001
From: Jakub Kadlčík <jkadlcik@redhat.com>
Date: Feb 03 2017 00:06:39 +0000
Subject: [PATCH 1/5] [frontend] fill module rpm components


---

diff --git a/frontend/coprs_frontend/coprs/forms.py b/frontend/coprs_frontend/coprs/forms.py
index 59b90f5..c73865f 100644
--- a/frontend/coprs_frontend/coprs/forms.py
+++ b/frontend/coprs_frontend/coprs/forms.py
@@ -749,6 +749,8 @@ class CreateModuleForm(wtf.Form):
     name = wtforms.StringField("Name")
     stream = wtforms.StringField("Stream")
     version = wtforms.IntegerField("Version")
+    builds = wtforms.FieldList(wtforms.StringField("Builds ID list"))
+    packages = wtforms.FieldList(wtforms.StringField("Packages list"))
     filter = wtforms.FieldList(wtforms.StringField("Package Filter"))
     api = wtforms.FieldList(wtforms.StringField("Module API"))
     profile_names = wtforms.FieldList(wtforms.StringField("Install Profiles"), min_entries=2)
diff --git a/frontend/coprs_frontend/coprs/logic/builds_logic.py b/frontend/coprs_frontend/coprs/logic/builds_logic.py
index dfa8b10..6607627 100644
--- a/frontend/coprs_frontend/coprs/logic/builds_logic.py
+++ b/frontend/coprs_frontend/coprs/logic/builds_logic.py
@@ -801,6 +801,24 @@ GROUP BY
     def filter_by_group_name(cls, query, group_name):
         return query.filter(models.Group.name == group_name)
 
+    @classmethod
+    def build_upstream_tuple(cls, build):
+        """
+        Attempts to determine upstream project for given build and returns most specific build source
+        Returns: Tuple (url, ref)
+        """
+        if build.source_type == helpers.BuildSourceEnum("srpm_link"):
+            return build.source_json_dict["url"], None
+        if build.source_type == helpers.BuildSourceEnum("git_and_tito"):
+            return build.source_json_dict["git_url"], build.source_json_dict["git_branch"]
+        if build.source_type == helpers.BuildSourceEnum("mock_scm"):
+            return build.source_json_dict["scm_url"], build.source_json_dict["scm_branch"]
+        if build.source_type == helpers.BuildSourceEnum("pypi"):
+            return "https://pypi.python.org/pypi/{}/".format(build.source_json_dict["pypi_package_name"]), None
+        if build.source_type == helpers.BuildSourceEnum("rubygems"):
+            return "https://rubygems.org/gems/{}/".format(build.source_json_dict["gem_name"]), None
+        return None, None
+
 
 class BuildChrootsLogic(object):
     @classmethod
diff --git a/frontend/coprs_frontend/coprs/templates/coprs/create_module.html b/frontend/coprs_frontend/coprs/templates/coprs/create_module.html
index 5cfbe21..b30d763 100644
--- a/frontend/coprs_frontend/coprs/templates/coprs/create_module.html
+++ b/frontend/coprs_frontend/coprs/templates/coprs/create_module.html
@@ -60,6 +60,13 @@
           </div>
         </div>
 
+
+        {% for package, build in built_packages %}
+          <input type="hidden" name="{{ 'packages-%s' |format(loop.index0) }}" value="{{ package }}">
+          <input type="hidden" name="{{ 'builds-%s' |format(loop.index0) }}" value="{{ build.id }}">
+        {% endfor %}
+
+
         {% set no_packages = 'No successfully built packages in this project yet' %}
 
         <div class="col-sm-4">
@@ -73,7 +80,7 @@
             <div class="panel-body">
 
               <label for="exampleInputEmail1">Packages <span class="text-muted">to be included:</span></label>
-              {% for package in packages %}
+              {% for package, build in built_packages %}
               <div class="checkbox">
                 <label>
                   {{ render_checkbox("filter-{}".format(loop.index0), package, (package in form.filter.data or not form.is_submitted())) }}
@@ -98,7 +105,7 @@
             <div class="panel-body">
               <div class="form-group">
                 <label>Packages <span class="text-muted">defining API:</span></label>
-                {% for package in packages %}
+                {% for package, build in built_packages %}
                 <div class="checkbox">
                   <label>
                     {{ render_checkbox("api-{}".format(loop.index0), package, (package in form.api.data)) }}
@@ -129,7 +136,7 @@
                 </div>
                 <div class="form-group">
                   <label for="exampleInputEmail1">Packages <span class="text-muted">installed by this profile:</span></label>
-                  {% for package in packages %}
+                  {% for package, build in built_packages %}
                   <div class="checkbox">
                     <label>
                       {{ render_checkbox("profile_pkgs-{}-{}".format(i, loop.index0), package, (package in form.profile_pkgs[i].data)) }}
diff --git a/frontend/coprs_frontend/coprs/views/coprs_ns/coprs_general.py b/frontend/coprs_frontend/coprs/views/coprs_ns/coprs_general.py
index 39fafef..d85fea0 100644
--- a/frontend/coprs_frontend/coprs/views/coprs_ns/coprs_general.py
+++ b/frontend/coprs_frontend/coprs/views/coprs_ns/coprs_general.py
@@ -929,12 +929,12 @@ def copr_create_module(copr):
 
 
 def render_create_module(copr, form, profiles=2):
-    packages = []
+    built_packages = []
     for build in filter(None, [p.last_build(successful=True) for p in copr.packages]):
         for package in build.built_packages.split("\n"):
-            packages.append(package.split()[0])
+            built_packages.append((package.split()[0], build))
 
-    return flask.render_template("coprs/create_module.html", copr=copr, form=form, packages=packages, profiles=profiles)
+    return flask.render_template("coprs/create_module.html", copr=copr, form=form, built_packages=built_packages, profiles=profiles)
 
 
 @coprs_ns.route("/<username>/<coprname>/create_module/", methods=["POST"])
@@ -984,6 +984,14 @@ def build_module(copr, form):
         for package in packages:
             mmd.profiles[name].add_rpm(str(package))
 
+    for package in form.filter.data:
+        build_id = form.builds.data[form.packages.data.index(package)]
+        build = builds_logic.BuildsLogic.get_by_id(build_id).first()
+
+        upstream_url, upstream_ref = builds_logic.BuildsLogic.build_upstream_tuple(build)
+        mmd.components.add_rpm(str(package), "User selected the package as a part of the module",
+                               buildorder=0, repository=upstream_url or "", ref=upstream_ref or "")
+
     module = ModulesLogic.add(flask.g.user, copr, ModulesLogic.from_modulemd(mmd.dumps()))
     db.session.flush()
     actions_logic.ActionsLogic.send_build_module(flask.g.user, copr, module)

From 6dcd7b0f01def918ec8e834fbbe46e451d9b0d79 Mon Sep 17 00:00:00 2001
From: Jakub Kadlčík <jkadlcik@redhat.com>
Date: Feb 03 2017 00:06:39 +0000
Subject: [PATCH 2/5] [frontend] specify module components buildorder


---

diff --git a/frontend/coprs_frontend/coprs/views/coprs_ns/coprs_general.py b/frontend/coprs_frontend/coprs/views/coprs_ns/coprs_general.py
index d85fea0..05e2358 100644
--- a/frontend/coprs_frontend/coprs/views/coprs_ns/coprs_general.py
+++ b/frontend/coprs_frontend/coprs/views/coprs_ns/coprs_general.py
@@ -990,7 +990,8 @@ def build_module(copr, form):
 
         upstream_url, upstream_ref = builds_logic.BuildsLogic.build_upstream_tuple(build)
         mmd.components.add_rpm(str(package), "User selected the package as a part of the module",
-                               buildorder=0, repository=upstream_url or "", ref=upstream_ref or "")
+                               buildorder=sorted([int(id) for id in form.builds.data]).index(build.id),
+                               repository=upstream_url or "", ref=upstream_ref or "")
 
     module = ModulesLogic.add(flask.g.user, copr, ModulesLogic.from_modulemd(mmd.dumps()))
     db.session.flush()

From e08103b3a76f3d04bd003f6c5725a07e652fd1bb Mon Sep 17 00:00:00 2001
From: Jakub Kadlčík <jkadlcik@redhat.com>
Date: Feb 03 2017 00:06:39 +0000
Subject: [PATCH 3/5] [frontend] return only the SCM urls


---

diff --git a/frontend/coprs_frontend/coprs/logic/builds_logic.py b/frontend/coprs_frontend/coprs/logic/builds_logic.py
index 6607627..3968831 100644
--- a/frontend/coprs_frontend/coprs/logic/builds_logic.py
+++ b/frontend/coprs_frontend/coprs/logic/builds_logic.py
@@ -804,19 +804,13 @@ GROUP BY
     @classmethod
     def build_upstream_tuple(cls, build):
         """
-        Attempts to determine upstream project for given build and returns most specific build source
+        Return upstream SCM source tuple for given build
         Returns: Tuple (url, ref)
         """
-        if build.source_type == helpers.BuildSourceEnum("srpm_link"):
-            return build.source_json_dict["url"], None
         if build.source_type == helpers.BuildSourceEnum("git_and_tito"):
             return build.source_json_dict["git_url"], build.source_json_dict["git_branch"]
         if build.source_type == helpers.BuildSourceEnum("mock_scm"):
             return build.source_json_dict["scm_url"], build.source_json_dict["scm_branch"]
-        if build.source_type == helpers.BuildSourceEnum("pypi"):
-            return "https://pypi.python.org/pypi/{}/".format(build.source_json_dict["pypi_package_name"]), None
-        if build.source_type == helpers.BuildSourceEnum("rubygems"):
-            return "https://rubygems.org/gems/{}/".format(build.source_json_dict["gem_name"]), None
         return None, None
 
 

From f541a3c5c1c3fbf41465b5a7dcec3f2c6a0872ec Mon Sep 17 00:00:00 2001
From: Jakub Kadlčík <jkadlcik@redhat.com>
Date: Feb 03 2017 00:06:39 +0000
Subject: [PATCH 4/5] [frontend] cast url and ref to string


---

diff --git a/frontend/coprs_frontend/coprs/views/coprs_ns/coprs_general.py b/frontend/coprs_frontend/coprs/views/coprs_ns/coprs_general.py
index 05e2358..3ffb49e 100644
--- a/frontend/coprs_frontend/coprs/views/coprs_ns/coprs_general.py
+++ b/frontend/coprs_frontend/coprs/views/coprs_ns/coprs_general.py
@@ -991,7 +991,7 @@ def build_module(copr, form):
         upstream_url, upstream_ref = builds_logic.BuildsLogic.build_upstream_tuple(build)
         mmd.components.add_rpm(str(package), "User selected the package as a part of the module",
                                buildorder=sorted([int(id) for id in form.builds.data]).index(build.id),
-                               repository=upstream_url or "", ref=upstream_ref or "")
+                               repository=str(upstream_url) or "", ref=str(upstream_ref) or "")
 
     module = ModulesLogic.add(flask.g.user, copr, ModulesLogic.from_modulemd(mmd.dumps()))
     db.session.flush()

From 733b6e6355e67d521926f1897ab0bacd2a579426 Mon Sep 17 00:00:00 2001
From: Jakub Kadlčík <jkadlcik@redhat.com>
Date: Feb 03 2017 00:06:39 +0000
Subject: [PATCH 5/5] [frontend] care only about packages in filter


---

diff --git a/frontend/coprs_frontend/coprs/views/coprs_ns/coprs_general.py b/frontend/coprs_frontend/coprs/views/coprs_ns/coprs_general.py
index 3ffb49e..0494ada 100644
--- a/frontend/coprs_frontend/coprs/views/coprs_ns/coprs_general.py
+++ b/frontend/coprs_frontend/coprs/views/coprs_ns/coprs_general.py
@@ -984,14 +984,17 @@ def build_module(copr, form):
         for package in packages:
             mmd.profiles[name].add_rpm(str(package))
 
+    build_ids = sorted(list(set([int(id) for p, id in zip(form.packages.data, form.builds.data)
+                                 if p in form.filter.data])))
     for package in form.filter.data:
         build_id = form.builds.data[form.packages.data.index(package)]
         build = builds_logic.BuildsLogic.get_by_id(build_id).first()
 
         upstream_url, upstream_ref = builds_logic.BuildsLogic.build_upstream_tuple(build)
+
         mmd.components.add_rpm(str(package), "User selected the package as a part of the module",
-                               buildorder=sorted([int(id) for id in form.builds.data]).index(build.id),
-                               repository=str(upstream_url) or "", ref=str(upstream_ref) or "")
+                               repository=str(upstream_url) or "", ref=str(upstream_ref) or "",
+                               buildorder=build_ids.index(int(build.id)))
 
     module = ModulesLogic.add(flask.g.user, copr, ModulesLogic.from_modulemd(mmd.dumps()))
     db.session.flush()