From f8972027ebb6135cd2a86a13df755b29231f8a92 Mon Sep 17 00:00:00 2001
From: Niolon <panikruth@gmail.com>
Date: Fri, 5 Dec 2025 11:41:59 +0000
Subject: [PATCH 01/11] Add changes

---
 environment.env.template                       |  3 ++-
 qcrbox_frontend/core/settings.py               |  5 ++++-
 qcrbox_frontend/qcrbox/templates/workflow.html |  8 +++++++-
 qcrbox_frontend/qcrbox/views/datasets.py       | 11 +++++++++--
 qcrbox_frontend/qcrbox/views/workflows.py      |  4 ++++
 5 files changed, 26 insertions(+), 5 deletions(-)

diff --git a/environment.env.template b/environment.env.template
index 92bd476..6e31918 100644
--- a/environment.env.template
+++ b/environment.env.template
@@ -8,7 +8,8 @@ POSTGRES_PASSWORD='postgres'
 POSTGRES_PORT=5432
 
 API_BASE_URL='http://host.docker.internal:11000'
-API_VISUALISER_PORT='12008'
+TRAEFIK_HTTP_PORT='12345'
+GUI_DOMAIN_PREFIX='.gui.'
 
 MAX_LENGTH_API_LOG=10000
 
diff --git a/qcrbox_frontend/core/settings.py b/qcrbox_frontend/core/settings.py
index f8692ec..24ef725 100644
--- a/qcrbox_frontend/core/settings.py
+++ b/qcrbox_frontend/core/settings.py
@@ -211,7 +211,10 @@
 
 # API settings
 API_BASE_URL = os.environ.get('API_BASE_URL', 'http://127.0.0.1:11000')
-API_VISUALISER_PORT = os.environ.get('API_VISUALISER_PORT', '12008')
+
+# Traefik / GUI Routing settings
+TRAEFIK_HTTP_PORT = os.environ.get('TRAEFIK_HTTP_PORT', '12345')
+GUI_DOMAIN_PREFIX = os.environ.get('GUI_DOMAIN_PREFIX', '.gui.')
 
 # Static files (CSS, JavaScript, Images)
 # https://docs.djangoproject.com/en/3.2/howto/static-files/
diff --git a/qcrbox_frontend/qcrbox/templates/workflow.html b/qcrbox_frontend/qcrbox/templates/workflow.html
index c1e37fd..ef14233 100644
--- a/qcrbox_frontend/qcrbox/templates/workflow.html
+++ b/qcrbox_frontend/qcrbox/templates/workflow.html
@@ -168,8 +168,14 @@ <h5><b><i>Calculation in progress, do not close this tab!</i></b></h5>
 {% if current_command.interactive %}
   <script>
     let hostname = window.location.hostname;
+    let appSlug = "{{ current_command.app.slug }}".replace(/_/g, "-");
+    let domainPrefix = "{{ gui_domain_prefix }}";
+    let port = "{{ traefik_port }}";
+    let portSuffix = port ? ":" + port : "";
+    
+    let url = `http://${appSlug}${domainPrefix}${hostname}${portSuffix}/`;
 
-    document.getElementById("start-app-button").addEventListener("click", function(){ window.open(`http://${hostname}:{{ current_command.app.port }}/vnc.html?path=vnc&autoconnect=true&resize=remote&reconnect=true&show_dot=true`, '_blank'); }); 
+    document.getElementById("start-app-button").addEventListener("click", function(){ window.open(url, '_blank'); }); 
   </script>
 {% elif calculation_in_progress %}
   <script>
diff --git a/qcrbox_frontend/qcrbox/views/datasets.py b/qcrbox_frontend/qcrbox/views/datasets.py
index 3cb6b9f..35899df 100644
--- a/qcrbox_frontend/qcrbox/views/datasets.py
+++ b/qcrbox_frontend/qcrbox/views/datasets.py
@@ -225,8 +225,15 @@ def visualise(request, dataset_id):
 
     # Get host name without port, manually prepend http:// to stop django
     # treating this as a relative URL
-    hostname = 'http://' + request.get_host().split(':')[0]
-    v_url = f'{hostname}:{settings.API_VISUALISER_PORT}/retrieve/{visualise_file_meta.backend_uuid}'
+    hostname = request.get_host().split(':')[0]
+    
+    # Construct the subdomain URL
+    # Format: http://[app-slug].gui.[hostname]:[traefik-port]/
+    subdomain = f'qcrbox-quality{settings.GUI_DOMAIN_PREFIX}{hostname}'
+    
+    port_suffix = f':{settings.TRAEFIK_HTTP_PORT}' if settings.TRAEFIK_HTTP_PORT else ''
+    
+    v_url = f'http://{subdomain}{port_suffix}/retrieve/{visualise_file_meta.backend_uuid}'
     LOGGER.info(
         'Opening Visualiser at "%s"',
         v_url,
diff --git a/qcrbox_frontend/qcrbox/views/workflows.py b/qcrbox_frontend/qcrbox/views/workflows.py
index 7cf168c..f16eb60 100644
--- a/qcrbox_frontend/qcrbox/views/workflows.py
+++ b/qcrbox_frontend/qcrbox/views/workflows.py
@@ -224,6 +224,10 @@ def workflow(request, file_id):
     else:
         context['app_session_id'] = None
 
+    # Pass Traefik config to template
+    context['traefik_port'] = settings.TRAEFIK_HTTP_PORT
+    context['gui_domain_prefix'] = settings.GUI_DOMAIN_PREFIX
+
     return render(request, 'workflow.html', context)
 
 

From db0ee03d55069be0d54a960f4628628dd7632b15 Mon Sep 17 00:00:00 2001
From: Niolon <panikruth@gmail.com>
Date: Fri, 5 Dec 2025 11:42:05 +0000
Subject: [PATCH 02/11] Update docs

---
 documentation/deployment_instructions.md | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/documentation/deployment_instructions.md b/documentation/deployment_instructions.md
index ddcdbdc..57f2058 100644
--- a/documentation/deployment_instructions.md
+++ b/documentation/deployment_instructions.md
@@ -35,7 +35,8 @@ The full list of settings is as follows:
     | `POSTGRES_PASSWORD` | The password for Postgres access.  This should be set to `'postgres'`. |
     | `POSTGRES_PORT` | The port through which the Postgres is exposed.  This should be set to `5432`. |
     | `API_BASE_URL` | The URL and port by which the QCrBox tool manager can be accessed.  If QCrBox is installed on the same machine as this setup, this should be set to `'http://host.docker.internal:11000'`. |
-    | `API_VISUALISER_PORT` | The port through which the QCrBox_quality visualiser can be accessed.  This should be set to `12008` in most cases. |
+    | `TRAEFIK_HTTP_PORT` | The port through which the Traefik router (which handles GUI routing) is exposed.  For development, this should be set to `12345`. |
+    | `GUI_DOMAIN_PREFIX` | The prefix for GUI subdomains.  This should be set to `.gui.` for default setups. |
     | `MAX_LENGTH_API_LOG` | The maximum length of API output to be saved in the logs.  As some API outputs can be quite long, this gives the option to truncate them in the logs, making the logs more unwieldy at the cost of losing some debug information. |
     | `DJANGO_SUPERUSER_EMAIL` | The email address for the default admin account to be created for the web app. |
     | `DJANGO_SUPERUSER_USERNAME` | The username for the default admin account to be created for the web app. |

From 4b3426a92de9a5853a57adb57b6a12ee92de99e8 Mon Sep 17 00:00:00 2001
From: Niolon <panikruth@gmail.com>
Date: Fri, 5 Dec 2025 11:54:34 +0000
Subject: [PATCH 03/11] small fixes

---
 qcrbox_frontend/core/settings.py         | 2 +-
 qcrbox_frontend/qcrbox/views/datasets.py | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/qcrbox_frontend/core/settings.py b/qcrbox_frontend/core/settings.py
index 24ef725..c8977d6 100644
--- a/qcrbox_frontend/core/settings.py
+++ b/qcrbox_frontend/core/settings.py
@@ -213,7 +213,7 @@
 API_BASE_URL = os.environ.get('API_BASE_URL', 'http://127.0.0.1:11000')
 
 # Traefik / GUI Routing settings
-TRAEFIK_HTTP_PORT = os.environ.get('TRAEFIK_HTTP_PORT', '12345')
+TRAEFIK_HTTP_PORT = int(os.environ.get('TRAEFIK_HTTP_PORT', '12345') or 12345)
 GUI_DOMAIN_PREFIX = os.environ.get('GUI_DOMAIN_PREFIX', '.gui.')
 
 # Static files (CSS, JavaScript, Images)
diff --git a/qcrbox_frontend/qcrbox/views/datasets.py b/qcrbox_frontend/qcrbox/views/datasets.py
index 35899df..ff4435b 100644
--- a/qcrbox_frontend/qcrbox/views/datasets.py
+++ b/qcrbox_frontend/qcrbox/views/datasets.py
@@ -227,13 +227,13 @@ def visualise(request, dataset_id):
     # treating this as a relative URL
     hostname = request.get_host().split(':')[0]
     
-    # Construct the subdomain URL
+    # Construct the visualiser domain URL
     # Format: http://[app-slug].gui.[hostname]:[traefik-port]/
-    subdomain = f'qcrbox-quality{settings.GUI_DOMAIN_PREFIX}{hostname}'
+    visualiser_domain = f'qcrbox-quality{settings.GUI_DOMAIN_PREFIX}{hostname}'
     
     port_suffix = f':{settings.TRAEFIK_HTTP_PORT}' if settings.TRAEFIK_HTTP_PORT else ''
     
-    v_url = f'http://{subdomain}{port_suffix}/retrieve/{visualise_file_meta.backend_uuid}'
+    v_url = f'http://{visualiser_domain}{port_suffix}/retrieve/{visualise_file_meta.backend_uuid}'
     LOGGER.info(
         'Opening Visualiser at "%s"',
         v_url,

From 331d4f7a56fe434caa592fc10bc2ec309f16dd6b Mon Sep 17 00:00:00 2001
From: Jamie Court <jc2a23@soton.ac.uk>
Date: Tue, 20 Jan 2026 15:59:56 +0000
Subject: [PATCH 04/11] Change iconography on initial page buttons

---
 qcrbox_frontend/qcrbox/templates/initial.html | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/qcrbox_frontend/qcrbox/templates/initial.html b/qcrbox_frontend/qcrbox/templates/initial.html
index 4b69c05..71c767f 100644
--- a/qcrbox_frontend/qcrbox/templates/initial.html
+++ b/qcrbox_frontend/qcrbox/templates/initial.html
@@ -18,7 +18,7 @@
             {{ loadfile_form.as_p }}
             <br/>
             <button type="submit" class="btn btn-primary" id="load-button">
-              <i class="fas fa-download"></i> Load
+              Load&nbsp&nbsp<i class="fas fa-arrow-right"></i>
             </button>
           </form>
         </td>
@@ -28,7 +28,7 @@
             {{ newfile_form.as_p }}
             <br/>
             <button type="submit" class="btn btn-primary" id="upload-button">
-              <i class="fas fa-upload"></i> Upload
+              Upload&nbsp&nbsp<i class="fas fa-upload"></i>
             </button>
           </form>
         </td>

From c2c31659d7db675bd50c7bf54d9931ac93a5e26b Mon Sep 17 00:00:00 2001
From: Jamie Court <jc2a23@soton.ac.uk>
Date: Tue, 20 Jan 2026 16:43:33 +0000
Subject: [PATCH 05/11] Add tooltips to link icons on workflow page

---
 .../qcrbox/templates/workflow.html            | 26 +++++++++----------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/qcrbox_frontend/qcrbox/templates/workflow.html b/qcrbox_frontend/qcrbox/templates/workflow.html
index ef14233..5bd8867 100644
--- a/qcrbox_frontend/qcrbox/templates/workflow.html
+++ b/qcrbox_frontend/qcrbox/templates/workflow.html
@@ -38,7 +38,7 @@
               <tr id="ancestor-row">
                 <td align='right'>
                   {% if prior_step.infile.active %}
-                    <a href="{% url 'workflow' prior_step.infile.pk %}" id="workflow-link-{{prior_step.infile.display_filename}}"><i class="fa-regular fa-square"></i></a>
+                    <span title="Load File"><a href="{% url 'workflow' prior_step.infile.pk %}" id="workflow-link-{{prior_step.infile.display_filename}}"><i class="fa-regular fa-square"></i></a></span>
                   {% else %}
                     <i class="fa-regular fa-square"></i>
                   {% endif %}
@@ -52,15 +52,15 @@
                 </td>
                 <td align='left' >
                   {% if prior_step.infile.active %}
-                    <a href="{% url 'download' prior_step.infile.pk %}" id="download-link-{{prior_step.infile.display_filename}}">
+                    <span title="Download File"><a href="{% url 'download' prior_step.infile.pk %}" id="download-link-{{prior_step.infile.display_filename}}">
                       <i class="fas fa-download"></i>
-                    </a>&nbsp 
-                    <a href="{% url 'visualise' prior_step.infile.pk %}" target="_blank" id="visualise-link-{{prior_step.infile.display_filename}}">
+                    </a></span>&nbsp
+                    <span title="Visualise Data"><a href="{% url 'visualise' prior_step.infile.pk %}" target="_blank" id="visualise-link-{{prior_step.infile.display_filename}}">
                       <i class="fas fa-eye"></i>
-                    </a>&nbsp
-                    <a href="{% url 'dataset_history' prior_step.infile.pk %}" id="history-link-{{prior_step.infile.display_filename}}">
+                    </a></span>&nbsp
+                    <span title="Data History"><a href="{% url 'dataset_history' prior_step.infile.pk %}" id="history-link-{{prior_step.infile.display_filename}}">
                       <i class="fas fa-clock"></i>
-                    </a>
+                    </a></span>
                   {% endif %}
                 </td>
               </tr>
@@ -81,15 +81,15 @@
                 <b id='current-filename'>{{file.display_filename}}</b>
               </td>
               <td align='left'>
-                <a href="{% url 'download' file.pk %}" id="download-link-current">
+                <span title="Download File"><a href="{% url 'download' file.pk %}" id="download-link-current">
                   <i class="fas fa-download"></i>
-                </a>&nbsp
-                <a href="{% url 'visualise' file.pk %}" target="_blank" id="visualise-link-current">
+                </a></span>&nbsp
+                <span title="Visualise Data"><a href="{% url 'visualise' file.pk %}" target="_blank" id="visualise-link-current">
                   <i class="fas fa-eye"></i>
-                </a>&nbsp
-                <a href="{% url 'dataset_history' file.pk %}" id="history-link-current">
+                </a></span>&nbsp
+                <span title="Data History"><a href="{% url 'dataset_history' file.pk %}" id="history-link-current">
                   <i class="fas fa-clock"></i>
-                </a>
+                </a></span>
               </td>
             </tr>
           </table>

From 0b8253d891d916f4b9db21cc7dc17f18295387a9 Mon Sep 17 00:00:00 2001
From: Jamie Court <jc2a23@soton.ac.uk>
Date: Wed, 21 Jan 2026 11:09:08 +0000
Subject: [PATCH 06/11] Add process information to each step on workflow view

---
 qcrbox_frontend/qcrbox/templates/workflow.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/qcrbox_frontend/qcrbox/templates/workflow.html b/qcrbox_frontend/qcrbox/templates/workflow.html
index 5bd8867..3ae3d59 100644
--- a/qcrbox_frontend/qcrbox/templates/workflow.html
+++ b/qcrbox_frontend/qcrbox/templates/workflow.html
@@ -69,7 +69,7 @@
                   <i class="fa-solid fa-arrow-down"></i>
                 </td>
                 <td align='left'>
-                  <i>&nbsp{{prior_step.application.name}}</i>
+                  <i>{{prior_step.command.app.name}}: {{prior_step.command}}</i>
                 </td>
               </tr>
             {% endfor %}

From c3b846d3188812ad9aa202a96bf6cec2dd034de3 Mon Sep 17 00:00:00 2001
From: Jamie Court <jc2a23@soton.ac.uk>
Date: Wed, 21 Jan 2026 11:19:56 +0000
Subject: [PATCH 07/11] Change layout of workflow page to make new command
 selection more intuitive

---
 qcrbox_frontend/qcrbox/templates/workflow.html | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/qcrbox_frontend/qcrbox/templates/workflow.html b/qcrbox_frontend/qcrbox/templates/workflow.html
index 3ae3d59..d17ba71 100644
--- a/qcrbox_frontend/qcrbox/templates/workflow.html
+++ b/qcrbox_frontend/qcrbox/templates/workflow.html
@@ -146,13 +146,21 @@ <h5><b><i>Calculation in progress, do not close this tab!</i></b></h5>
             {% endif %}
             {% if session_in_progress or calculation_in_progress %}
             {% else %}
-              <hr>
+              {% if current_command %}
+                </div></div>
+                <br/>
+                <div class="card">
+                <div class="card-body">
+                <h4>Select Different Command</h4>
+              {% else %}
+                <hr>
+              {% endif %}
               <center>
                 <form action="" method="POST" enctype="multipart/form-data">
                   {% csrf_token %}
                   {{ select_command_form.as_p }}
                   <button type="submit" class="btn btn-primary" id="select-app-button">
-                    Select Application
+                    Select Command
                   </button>
                 </form>
               </center>

From 2881c3a2808d7892cd24b0b0bcc368f96614548b Mon Sep 17 00:00:00 2001
From: Jamie Court <jc2a23@soton.ac.uk>
Date: Wed, 21 Jan 2026 11:58:14 +0000
Subject: [PATCH 08/11] Stop appending command name onto file outputs, fix bug
 where output file could equal input (or file already on the nats)

---
 qcrbox_frontend/qcrbox/forms.py    |  2 +-
 qcrbox_frontend/qcrbox/utility.py  | 26 ++++++++++++++++++++++++++
 qcrbox_frontend/qcrbox/workflow.py |  3 +++
 3 files changed, 30 insertions(+), 1 deletion(-)

diff --git a/qcrbox_frontend/qcrbox/forms.py b/qcrbox_frontend/qcrbox/forms.py
index 1510bec..49bf106 100644
--- a/qcrbox_frontend/qcrbox/forms.py
+++ b/qcrbox_frontend/qcrbox/forms.py
@@ -377,7 +377,7 @@ def __init__(self, *args, command, dataset, **kwargs):
                 else:
                     ext = 'cif'
 
-                filepath = filepath + f'_{command.name}.{ext}'
+                filepath = filepath + f'.{ext}'
 
                 self.fields[param.name] = forms.CharField(
                     initial=filepath,
diff --git a/qcrbox_frontend/qcrbox/utility.py b/qcrbox_frontend/qcrbox/utility.py
index 252cc05..9b75d85 100644
--- a/qcrbox_frontend/qcrbox/utility.py
+++ b/qcrbox_frontend/qcrbox/utility.py
@@ -5,6 +5,7 @@
 
 '''
 
+import re
 import textwrap
 
 from django.core.exceptions import PermissionDenied
@@ -255,3 +256,28 @@ def check_user_view_file_permission(user, load_file):
 
     else:
         raise PermissionDenied
+
+def get_next_valid_filename(filename):
+    ''' Check whether a proposed output filename already exists on record and,
+    if so, modify it to prevent a clash.'''
+
+    file_metas = models.FileMetaData.objects                            # pylint: disable=no-member
+    inv_filenames = file_metas.values_list('filename', flat=True)
+    if not filename in inv_filenames:
+        return filename
+
+    fname_components = filename.split('.')
+    fn_root = fname_components[0]
+    fn_ext = fname_components[-1]
+
+    fn_root = re.sub(r'\(\d+\)$', '', fn_root)
+    if not f'{fn_root}.{fn_ext}' in inv_filenames:
+        return f'{fn_root}.{fn_ext}'
+
+    f_ind = 1
+
+    # Find the next valid pattern 'filename_root(x).ext' which is not already in use
+    while True:
+        if not f'{fn_root}({f_ind}).{fn_ext}' in inv_filenames:
+            return f'{fn_root}({f_ind}).{fn_ext}'
+        f_ind += 1
diff --git a/qcrbox_frontend/qcrbox/workflow.py b/qcrbox_frontend/qcrbox/workflow.py
index c4824ef..fe95f4f 100644
--- a/qcrbox_frontend/qcrbox/workflow.py
+++ b/qcrbox_frontend/qcrbox/workflow.py
@@ -704,6 +704,9 @@ def handle_command(request, command, infile):
         output_dtypes = ('QCrBox.output_path','QCrBox.output_cif')
         for i in cps.filter(dtype__in=output_dtypes).values_list('name',flat=True):
             params[i] = params[i].replace('/','_')
+            print(params[i])
+            params[i] = utility.get_next_valid_filename(params[i])
+            print(params[i])
 
         # If the command corresponds to an interactive session, launch it
         if command.interactive:

From fd4afb05a13ad5ff6249b64e89d1d75d9807a679 Mon Sep 17 00:00:00 2001
From: Jamie Court <jc2a23@soton.ac.uk>
Date: Wed, 21 Jan 2026 13:39:31 +0000
Subject: [PATCH 09/11] Truncate long filenames in load file dropdown and
 workflow view

---
 qcrbox_frontend/qcrbox/forms.py                | 2 +-
 qcrbox_frontend/qcrbox/models.py               | 5 ++++-
 qcrbox_frontend/qcrbox/templates/workflow.html | 6 +++---
 3 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/qcrbox_frontend/qcrbox/forms.py b/qcrbox_frontend/qcrbox/forms.py
index 49bf106..0187881 100644
--- a/qcrbox_frontend/qcrbox/forms.py
+++ b/qcrbox_frontend/qcrbox/forms.py
@@ -96,7 +96,7 @@ def __init__(self, *args, user, **kwargs):
 
         objs = models.FileMetaData.objects                              # pylint: disable=no-member
         qset = objs.filter(active=True).filter(group__in=permitted_groups)
-        choices = [(f.pk, f.display_filename) for f in qset.all()]
+        choices = [(f.pk, str(f)) for f in qset.all()]
 
         self.fields['file'].choices = choices
 
diff --git a/qcrbox_frontend/qcrbox/models.py b/qcrbox_frontend/qcrbox/models.py
index 580d99d..fadbc12 100644
--- a/qcrbox_frontend/qcrbox/models.py
+++ b/qcrbox_frontend/qcrbox/models.py
@@ -55,8 +55,11 @@ class FileMetaData(models.Model):
 
     def __str__(self):
         '''Return the filename when an instance of this is parsed as string'''
+        max_len = 30
 
-        return str(self.display_filename)
+        if len(self.display_filename) < max_len:
+            return str(self.display_filename)
+        return str(str(self.display_filename)[:max_len-3]+'...')
 
 
 class Application(models.Model):
diff --git a/qcrbox_frontend/qcrbox/templates/workflow.html b/qcrbox_frontend/qcrbox/templates/workflow.html
index d17ba71..411118c 100644
--- a/qcrbox_frontend/qcrbox/templates/workflow.html
+++ b/qcrbox_frontend/qcrbox/templates/workflow.html
@@ -45,7 +45,7 @@
                 </td>
                 <td align='left' padding=15px>
                   {% if prior_step.infile.active %}
-                    {{prior_step.infile.display_filename}}
+                    {{prior_step.infile}}
                   {% else %}
                     <i>Deleted</i>
                   {% endif %}
@@ -78,7 +78,7 @@
                 <i class="fa-solid fa-square"></i>
               </td>
               <td align='left'>
-                <b id='current-filename'>{{file.display_filename}}</b>
+                <b id='current-filename'>{{file}}</b>
               </td>
               <td align='left'>
                 <span title="Download File"><a href="{% url 'download' file.pk %}" id="download-link-current">
@@ -100,7 +100,7 @@
             {% if not current_command %}
               <h4>Dataset Metadata</h4>
               <ul>
-                <li>Dataset ID: {{file.backend_uuid}}</li>
+                <li>Filename: {{file.display_filename}}</li>
                 <li>Filetype: {{file.filetype}}</li>
               </ul>
               <i>Please select a command from the workflow to continue processing.</i>

From 63d073d549e1fed5bf86acc653ddcf02398fc093 Mon Sep 17 00:00:00 2001
From: Jamie Court <jc2a23@soton.ac.uk>
Date: Thu, 22 Jan 2026 11:42:54 +0000
Subject: [PATCH 10/11] Change container on workflow page to reduce whitespace

---
 qcrbox_frontend/qcrbox/templates/workflow.html | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/qcrbox_frontend/qcrbox/templates/workflow.html b/qcrbox_frontend/qcrbox/templates/workflow.html
index 411118c..35be572 100644
--- a/qcrbox_frontend/qcrbox/templates/workflow.html
+++ b/qcrbox_frontend/qcrbox/templates/workflow.html
@@ -23,8 +23,8 @@
 
 </style>
 
-<div class="container">
-  <div class="row justify-content-center">
+<div class="container-fluid">
+  <div class="row">
     <div id="cached-interactive-session-id" title={{app_session_id}}></div>
     <table width=100%>
       <tr>

From 3b7ea4580852a4c3816a20235ac9a61ce54f7bdf Mon Sep 17 00:00:00 2001
From: Jamie Court <jc2a23@soton.ac.uk>
Date: Thu, 22 Jan 2026 14:06:17 +0000
Subject: [PATCH 11/11] Changing file load menu behaviour; only shows files
 with no ancestors, and redirects the user to a files newest descendant rather
 than the file itself

---
 qcrbox_frontend/qcrbox/forms.py           |  7 +++++++
 qcrbox_frontend/qcrbox/models.py          | 25 +++++++++++++++++++++++
 qcrbox_frontend/qcrbox/views/workflows.py |  6 +++++-
 3 files changed, 37 insertions(+), 1 deletion(-)

diff --git a/qcrbox_frontend/qcrbox/forms.py b/qcrbox_frontend/qcrbox/forms.py
index 0187881..ffe02a8 100644
--- a/qcrbox_frontend/qcrbox/forms.py
+++ b/qcrbox_frontend/qcrbox/forms.py
@@ -96,6 +96,13 @@ def __init__(self, *args, user, **kwargs):
 
         objs = models.FileMetaData.objects                              # pylint: disable=no-member
         qset = objs.filter(active=True).filter(group__in=permitted_groups)
+
+        # Filter to only retain the oldest file in each workflow tree, i.e. files which are
+        # not the output of any process
+        process_objs = models.ProcessStep.objects                       # pylint: disable=no-member
+        process_outfiles = process_objs.all().values_list('outfile', flat=True)
+        qset = qset.exclude(pk__in=process_outfiles)
+
         choices = [(f.pk, str(f)) for f in qset.all()]
 
         self.fields['file'].choices = choices
diff --git a/qcrbox_frontend/qcrbox/models.py b/qcrbox_frontend/qcrbox/models.py
index fadbc12..0077f55 100644
--- a/qcrbox_frontend/qcrbox/models.py
+++ b/qcrbox_frontend/qcrbox/models.py
@@ -61,6 +61,31 @@ def __str__(self):
             return str(self.display_filename)
         return str(str(self.display_filename)[:max_len-3]+'...')
 
+    def get_newest_descendant(self):
+        '''Get the most recently created FileMetaData object which is a direct
+        descendant of this FileMetaData'''
+
+        related_pks = [self.pk]
+        last_gen_pks = [self.pk]
+
+        process_step_objs = ProcessStep.objects                         # pylint: disable=no-member
+
+        # Recursively scan all related process_steps for descendant pks
+        while len(last_gen_pks)>0:
+            gen_processes = process_step_objs.filter(infile__pk__in=last_gen_pks)
+            this_gen_pks = gen_processes.values_list('outfile__pk', flat=True)
+            related_pks += this_gen_pks
+            last_gen_pks = this_gen_pks
+
+        # Fetch the object corresponding to the most recently created related
+        # FileMetaData
+        file_metadata_objs = FileMetaData.objects                       # pylint: disable=no-member
+
+        related_objs = file_metadata_objs.filter(pk__in=related_pks)
+        recent_obj = related_objs.order_by('creation_time').last()
+
+        return recent_obj
+
 
 class Application(models.Model):
     '''The Application model stores information on Applications; e.g. the
diff --git a/qcrbox_frontend/qcrbox/views/workflows.py b/qcrbox_frontend/qcrbox/views/workflows.py
index f16eb60..56196b7 100644
--- a/qcrbox_frontend/qcrbox/views/workflows.py
+++ b/qcrbox_frontend/qcrbox/views/workflows.py
@@ -77,7 +77,11 @@ def initialise_workflow(request):
             ## Handle file loading here.
 
             # If user chose to load pre-existing file, fetch that file's ID
-            redirect_pk = request.POST['file']
+            mod_objs = models.FileMetaData.objects                      # pylint: disable=no-member
+            selected_file = mod_objs.get(pk=request.POST['file'])
+
+            # Find most recently created descendant of selected file
+            redirect_pk = selected_file.get_newest_descendant().pk
 
         else: