feat: add some indicators for imported releases

on the model detail page as well as in review stuff

Author: sgfost

django/library/fs.py

@@ -873,7 +873,12 @@ def _guess_file_category(self, name: Path) -> str:
         """return an appropriate category name for a file based on its extension.
         currently defaults to code for all files except pdfs, which can be reasonably assumed to be docs
         """
-        if name.suffix == ".pdf":
+        if (
+            name.suffix == ".pdf"
+            or name.suffix == ".docx"
+            or name.suffix == ".doc"
+            or name.suffix == ".md"
+        ):
             return FileCategories.docs.name
         return FileCategories.code.name
 

django/library/jinja2/library/codebases/macros.jinja

@@ -109,3 +109,9 @@
         </div>
     </div>
 {% endmacro %}
+
+{% macro imported_release_indicator(release) %}
+    {% if release.is_imported and release.imported_release_package.service %}
+        <i class="small text-muted fas fa-file-import" title="This release was imported from {{ release.imported_release_package.service }}"></i>
+    {% endif %}
+{% endmacro %}

django/library/jinja2/library/codebases/releases/retrieve.jinja

@@ -1,6 +1,7 @@
 {% extends "sidebar_layout.jinja" %}
 {% from "common.jinja" import breadcrumb, embed_discourse_comments, share_card, search_tag_href, member_profile_href, render_ogp_tags, alert_if_spam, mark_spam_confirm_modal %}
 {% from "library/review/includes/macros.jinja" import confirm_change_closed_modal %}
+{% from "library/codebases/macros.jinja" import imported_release_indicator %}
 
 {% set open_code_badge_png_url = request.build_absolute_uri(static("images/icons/open-code-badge.png")) %}
 {% set open_code_badge_svg_url = request.build_absolute_uri(static("images/icons/open-code-badge.svg")) %}
@@ -102,7 +103,9 @@
         {% else %}
             <div class="alert alert-danger mt-2">The release you are viewing is currently unpublished.</div>
         {% endif %}
-        <h1 class='codebase-title mb-3'>{{ codebase.title }} <span class="badge bg-gray py-1 px-2">{{ release.version_number }}</span></h1>
+        <h1 class='codebase-title mb-3'>
+            {{ codebase.title }} <span class="badge bg-gray py-1 px-2">{{ release.version_number }}</span>
+        </h1>
         <div class='metadata text-muted mb-2'>
             <span class="me-3">
                 <b>Submitted by</b>
@@ -401,6 +404,17 @@
             <div class="card-text mb-3">
                 {{ release.version_number }}
             </div>
+            {% with imported_package = release.imported_release_package %}
+            {% if imported_package and imported_package.display_name and imported_package.html_url %}
+                <b class='card-title'>Imported From</b>
+                <div class="card-text mb-3">
+                    <a href='{{ imported_package.html_url }}'>
+                        <i class="fas fa-tag"></i>
+                        {{ imported_package.display_name }}
+                    </a>
+                </div>
+            {% endif %}
+            {% endwith %}
             <b class='card-title'>License</b>
             <div class="card-text mb-3">
                 <a href='{{ release.license.url }}'>{{ release.license.name }}</a>
@@ -551,7 +565,7 @@
                 <tbody>
                     {% for related_release in codebase.ordered_releases_list(has_change_perm, asc=False) %}
                         <tr>
-                            <td><a href='{{ related_release.get_absolute_url() }}'>{{ related_release.version_number }}</a></td>
+                            <td><a href='{{ related_release.get_absolute_url() }}'>{{ related_release.version_number }} {{ imported_release_indicator(related_release) }}</a></td>
                             <td>
                                 {% if release.live or has_change_perm %}
                                     {{ member_profile_href(related_release.submitter.member_profile) }}

django/library/jinja2/library/github_sync_overview.jinja

@@ -170,7 +170,7 @@
                 <div class="col-md-6">
                     <div class="card mb-4">
                         <div class="card-header d-flex align-items-center justify-content-between">
-                            <h3 class="mb-0"><i class="fas fa-archive"></i> Importing</h3>
+                            <h3 class="mb-0"><i class="fas fa-file-import"></i> Importing</h3>
                             <span class="text-muted">(GitHub → CoMSES)</span>
                         </div>
                         <div class="card-body">

django/library/jinja2/library/review/dashboard.jinja

@@ -1,6 +1,7 @@
 {% extends 'sidebar_layout.jinja' %}
 {% from "common.jinja" import breadcrumb, paginator %}
 {% from "library/review/includes/macros.jinja" import display_closed_status %}
+{% from "library/codebases/macros.jinja" import imported_release_indicator %}
 
 {% block introduction %}
     <h1>Peer Review Editor Dashboard</h1>
@@ -32,6 +33,7 @@
                     {% set review = release.review %}
                     <hr>
                     <h5 class="fw-bold">
+                        {{ imported_release_indicator(release) }}
                         <a href="{{ review.get_absolute_url() }}">Review for version {{ release.version_number }}</a>
                         {{ display_closed_status(review) }}
                     </h5>

django/library/jinja2/library/review/feedback/update.jinja

@@ -35,6 +35,12 @@
         <a target='_blank' href="{{ review_feedback.invitation.review.codebase_release.share_url }}">
             (click here to open in a new window/tab)
         </a>
+        {% if release.is_imported %}
+        <p><i>
+            Please note that this model release was imported from GitHub, so the file structure may differ from
+            a typical release package in the CoMSES Model Library.
+        </i></p>
+        {% endif %}
         </p>
         <div class='alert alert-info' role='alert'>
             You can save your progress at any time with the save button. Use the Submit button to send your finalized

django/library/jinja2/library/review/invitations/update.jinja

@@ -29,6 +29,12 @@
         </ul>
         If this model is not published, please do not share it with anyone else.
         </p>
+        {% if release.is_imported %}
+        <p><i>
+            Please note that this model release was imported from GitHub, so the file structure may differ from
+            a typical release package in the CoMSES Model Library.
+        </i></p>
+        {% endif %}
     </section>
 
     <section>

django/library/models.py

@@ -6,6 +6,7 @@
 import os
 import pathlib
 from string import Template
+import uuid
 import semver
 from datetime import timedelta
 from packaging.version import Version

frontend/src/components/GitHubRemoteItem.vue

@@ -40,7 +40,7 @@
         <label class="form-check-label" for="flexSwitchCheckDefault1">Importing</label>
         <div>
           <small class="form-text text-muted text-nowrap"
-            ><small><i class="fas fa-archive"></i> from GitHub</small></small
+            ><small><i class="fas fa-file-import"></i> from GitHub</small></small
           >
         </div>
       </div>