Merge branch 'upstream/master' into bs-393

* upstream/master:
  Take packages nevra from build meta field (#566)
  Fix modular information display in build feed (#565)

Author: javihernandez

src/components/BuildFeedItem.vue

@@ -2,10 +2,7 @@
   <q-card square class="shadow-1">
     <q-card-section class="no-padding row">
       <div style="overflow: auto" class="col-10">
-        <div
-          class="q-pt-sm q-pl-md"
-          v-if="rpm_module && Object.keys(rpm_module).length !== 0"
-        >
+        <div class="q-pt-sm q-pl-md" v-if="rpm_module">
           <span>
             <b>Built modules:&nbsp;</b>
           </span>
@@ -148,14 +145,13 @@
         return new Date(this.build.created_at).toLocaleString()
       },
       rpm_module() {
-        let rpm_module = []
-        this.build.tasks.forEach((task) => {
+        for (const task of this.build.tasks) {
+          if (task.arch === 'src') continue
           if (task.rpm_modules) {
-            rpm_module = task.rpm_modules[0]
-            return
+            return task.rpm_modules[0]
           }
-        })
-        return rpm_module
+        }
+        return false
       },
     },
     methods: {

src/pages/CreateErrata.vue

@@ -577,21 +577,26 @@
                       artifact.name.includes('debuginfo')
                     )
                       continue
-                    let newPkg = splitRpmFileName(artifact.name)
-                    let alreadyAdded = pkgs.find((pkg) => {
+                    let pkg = artifact.meta
+                    // TODO: Remove this fallback afte some time
+                    if (!pkg) {
+                      pkg = splitRpmFileName(artifact.name)
+                      pkg.epoch = 0
+                    }
+                    let alreadyAdded = pkgs.find((p) => {
                       return (
-                        pkg.name === newPkg.name &&
-                        pkg.version === newPkg.version &&
-                        pkg.release === newPkg.release
+                        p.name === pkg.name &&
+                        p.version === pkg.version &&
+                        p.release === pkg.release
                       )
                     })
                     if (alreadyAdded) continue
                     pkgs.push({
-                      name: newPkg.name,
-                      epoch: 0,
-                      version: newPkg.version,
-                      release: newPkg.release,
-                      arch: newPkg.arch,
+                      name: pkg.name,
+                      epoch: pkg.epoch,
+                      version: pkg.version,
+                      release: pkg.release,
+                      arch: pkg.arch,
                       reboot_suggested: false,
                       build_id: build.id,
                     })