Improve packages webui

spkrepo/templates/frontend/package.html

@@ -8,9 +8,7 @@
     </a>
     <div class="media-body">
       <h1 class="media-heading">{{ package.versions[-1].displaynames['enu'].displayname }}
-        <small>v{{ package.versions[-1].version_string }}
-          {% if package.versions[-1].report_url %}<span class="label label-danger">beta</span>{% endif %}
-        </small>
+        <small>v{{ package.versions[-1].version_string }}</small>
       </h1>
       <p>{{ package.versions[-1].descriptions['enu'].description }}</p>
       <div class="package-screenshots">
@@ -20,31 +18,36 @@ <h1 class="media-heading">{{ package.versions[-1].displaynames['enu'].displaynam
       </div>
       {% for version in package.versions|reverse %}
       <dl>
-        <dt>Version {{ version.version_string | safe }}</dt>
+        <dt>Version {{ version.version_string | safe }}{% if version.report_url %} <span class="label label-danger">beta</span>{% endif %}</dt>
         <dd>{{ version.changelog | safe }}</dd>
         <dt>Date</dt>
-        <dd>{{ version.insert_date }}</dd>
+        <dd>{{ version.insert_date.replace(microsecond=0) }}</dd>
         <dt>Architectures</dt>
         <dd>
-          {% for (version, builds) in version.builds_per_dsm.items() %}
+        {% for (version, builds) in version.builds_per_dsm.items() %}
           <!-- Group firmware by DSM or SRM if 1.x -->
           {% if version == '1' %}
-          SRM {{ version }}.x:
+            SRM {{ version }}.x:
           {% else %}
-          DSM {{ version }}.x:
+            DSM {{ version }}.x:
           {% endif %}
           {% for build in builds %}
-          {% for arch in build.architectures %}
-          <a href="{{ url_for('nas.data', path=build.path) }}"><span class="label label-default">{{ build.firmware.version }} {{ arch.code }}</span></a>
-          {% endfor %}
+            {% if build.active %}
+              {% for arch in build.architectures %}
+              <a href="{{ url_for('nas.data', path=build.path) }}"><span class="label label-success">{{ build.firmware.version }} {{ arch.code }}</span></a>
+              {% endfor %}
+            {% else %}
+              {% for arch in build.architectures %}
+              <a href="{{ url_for('nas.data', path=build.path) }}"><span class="label label-default" data-toggle="tooltip" title="Inactive: Manual installation only. This Package might be under development and have pending issues.">{{ build.firmware.version }} {{ arch.code }}</span></a>
+              {% endfor %}
+            {% endif %}
           {% endfor %}
           <br/>
-          {% endfor %}
+        {% endfor %}
         </dd>
       </dl>
       {% endfor %}
     </div>
-    <span
   </div>
 </div>
 {% endblock %}

spkrepo/templates/frontend/packages.html

@@ -12,9 +12,7 @@
         </a>
         <div class="media-body">
           <h4 class="media-heading">{{ version.displaynames['enu'].displayname }}
-            <small>v{{ version.version_string }}
-              {% if version.report_url %}<span class="label label-danger">beta</span>{% endif %}
-            </small>
+            <small>v{{ version.version_string }}</small>
           </h4>
           <div class="ellipsis package-description">
             <p>{{ version.descriptions['enu'].description }}</p>

spkrepo/tests/test_frontend.py

@@ -24,7 +24,7 @@ def test_get_logged_user(self):
 
 
 class PackagesTestCase(BaseTestCase):
-    def test_get_active_stable(self):
+    def test_get_active(self):
         build = BuildFactory(version__report_url=None, active=True)
         db.session.commit()
         response = self.client.get(url_for("frontend.packages"))
@@ -35,45 +35,67 @@ def test_get_active_stable(self):
         )
         self.assertNotIn("beta", response.data.decode())
 
-    def test_get_active_not_stable(self):
-        build = BuildFactory(active=True)
+    def test_get_not_active(self):
+        build = BuildFactory(active=False)
         db.session.commit()
         response = self.client.get(url_for("frontend.packages"))
         self.assert200(response)
         self.assertIn(
             build.version.displaynames["enu"].displayname,
             response.data.decode(),
         )
-        self.assertIn("beta", response.data.decode())
 
-    def test_get_not_active_not_stable(self):
-        build = BuildFactory(active=False)
+
+class PackageTestCase(BaseTestCase):
+    def test_get_active_stable(self):
+        build = BuildFactory(
+            version__package__author=UserFactory(),
+            version__report_url=None,
+            active=True,
+        )
         db.session.commit()
-        response = self.client.get(url_for("frontend.packages"))
+        response = self.client.get(
+            url_for("frontend.package", name=build.version.package.name)
+        )
         self.assert200(response)
-        self.assertNotIn(
+        for a in build.architectures:
+            self.assertIn(a.code, response.data.decode())
+        self.assertIn(
             build.version.displaynames["enu"].displayname,
             response.data.decode(),
         )
+        self.assertIn(
+            build.version.descriptions["enu"].description,
+            response.data.decode(),
+        )
         self.assertNotIn("beta", response.data.decode())
 
     def test_get_not_active_stable(self):
-        build = BuildFactory(active=False)
+        build = BuildFactory(
+            version__package__author=UserFactory(),
+            version__report_url=None,
+            active=False,
+        )
         db.session.commit()
-        response = self.client.get(url_for("frontend.packages"))
+        response = self.client.get(
+            url_for("frontend.package", name=build.version.package.name)
+        )
         self.assert200(response)
-        self.assertNotIn(
+        for a in build.architectures:
+            self.assertIn(a.code, response.data.decode())
+        self.assertIn(
             build.version.displaynames["enu"].displayname,
             response.data.decode(),
         )
+        self.assertIn(
+            build.version.descriptions["enu"].description,
+            response.data.decode(),
+        )
         self.assertNotIn("beta", response.data.decode())
 
-
-class PackageTestCase(BaseTestCase):
-    def test_get(self):
+    def test_get_active_not_stable(self):
         build = BuildFactory(
             version__package__author=UserFactory(),
-            version__report_url=None,
             active=True,
         )
         db.session.commit()
@@ -91,6 +113,29 @@ def test_get(self):
             build.version.descriptions["enu"].description,
             response.data.decode(),
         )
+        self.assertIn("beta", response.data.decode())
+
+    def test_get_not_active_not_stable(self):
+        build = BuildFactory(
+            version__package__author=UserFactory(),
+            active=False,
+        )
+        db.session.commit()
+        response = self.client.get(
+            url_for("frontend.package", name=build.version.package.name)
+        )
+        self.assert200(response)
+        for a in build.architectures:
+            self.assertIn(a.code, response.data.decode())
+        self.assertIn(
+            build.version.displaynames["enu"].displayname,
+            response.data.decode(),
+        )
+        self.assertIn(
+            build.version.descriptions["enu"].description,
+            response.data.decode(),
+        )
+        self.assertIn("beta", response.data.decode())
 
     def test_get_no_package(self):
         response = self.client.get(url_for("frontend.package", name="no-package"))

spkrepo/views/admin.py

@@ -290,7 +290,7 @@ def on_model_delete(self, model):
         ("upgrade_wizard", "upgrade_wizard"),
         ("startable", "startable"),
     )
-    # TODO: Add beta and all_builds_active with Flask-Admin>1.0.8
+
     column_default_sort = (Version.insert_date, True)
 
     # Custom queries
@@ -533,7 +533,7 @@ def can_unsign(self):
         ("insert_date", "insert_date"),
         ("active", "active"),
     )
-    # TODO: Add version.package with Flask-Admin>1.0.8
+
     column_default_sort = (Build.insert_date, True)
 
     # Custom queries

spkrepo/views/frontend.py

@@ -64,12 +64,12 @@ def profile():
 
 @frontend.route("/packages")
 def packages():
+    # show only packages with at least one version, but ignore whether builds are active
     latest_version = (
         db.session.query(
             Version.package_id, db.func.max(Version.version).label("latest_version")
         )
         .join(Build)
-        .filter(Build.active)
         .group_by(Version.package_id)
         .subquery()
     )
@@ -96,7 +96,6 @@ def packages():
 
 @frontend.route("/package/<name>")
 def package(name):
-    # TODO: show only packages with at least a version and an active build
     package = Package.query.filter_by(name=name).first()
     if package is None:
         abort(404)