Fix debugger on submission detail and evalution pages

app/assets/javascripts/coding_scratchpad.ts

@@ -43,6 +43,7 @@ export async function initPapyros(programmingLanguage: ProgrammingLanguage): Pro
                 locale: i18n.locale(),
                 inputMode: InputMode.Interactive,
                 channelOptions: {
+                    root: "/",
                     serviceWorkerName: "inputServiceWorker.js"
                 }
             });

app/views/activities/_coding_scratchpad.html.erb

@@ -9,8 +9,8 @@ data-bs-target="#scratchpad-offcanvas" aria-controls="scratchpad-offcanvas" id="
 <div class="offcanvas offcanvas-end" tabindex="-1" id="scratchpad-offcanvas" data-bs-keyboard="false">
   <div class="scratchpad-header">
   <h4>
-      <%= activity_icon(@activity, 24) %>
-      &nbsp; <%= t('.title', programming_language: @activity.programming_language.name.titleize) %>
+      <%= activity_icon(activity, 24) %>
+      &nbsp; <%= t('.title', programming_language: activity.programming_language.name.titleize) %>
   </h4>
   <div class="flex-spacer"></div>
   <button class="btn-close btn-close-white" id="scratchpad-offcanvas-close-btn"
@@ -45,7 +45,7 @@ data-bs-target="#scratchpad-offcanvas" aria-controls="scratchpad-offcanvas" id="
         </div>
         <div class="tab-content" id="scratchpad-tab-content">
           <div  id="scratchpad-description" role="tabpanel" class="tab-pane fade show active">
-            <%= description_iframe @activity %>
+            <%= description_iframe activity %>
           </div>
           <div id="scratchpad-trace-wrapper" role="tabpanel" class="tab-pane fade"></div>
         </div>
@@ -56,7 +56,7 @@ data-bs-target="#scratchpad-offcanvas" aria-controls="scratchpad-offcanvas" id="
 <script type="text/javascript">
   dodona.ready.then(function () {
         dodona.initCodingScratchpad(
-            "<%= escape_javascript @activity.programming_language&.name %>"
+            "<%= escape_javascript activity.programming_language&.name %>"
         );
     });
 </script>

app/views/feedbacks/show.html.erb

@@ -80,6 +80,9 @@
   </div>
 </div>
 <% if @feedback.submission.present? %>
+  <% if @feedback.submission.exercise.programming_language&.name == 'python' %>
+    <%= render partial: 'activities/coding_scratchpad', locals: { activity: @feedback.submission.exercise } %>
+  <% end %>
   <script>
       dodona.ready.then(function () {
         window.dodona.setEvaluationId(<%= @feedback.evaluation.id %>);

app/views/submissions/show.html.erb

@@ -29,6 +29,9 @@
     </div>
   </div>
 </div>
+<% if @submission.exercise.programming_language&.name == 'python' %>
+  <%= render partial: 'activities/coding_scratchpad', locals: { activity: @submission.exercise } %>
+<% end %>
 <% if @submission.queued? || @submission.running? %>
   <script>setTimeout(function () {
       location.reload(1);

config/routes.rb

@@ -90,14 +90,10 @@
 
     resources :courses do
       resources :series, only: %i[new index] do
-        resources :activities, only: %i[show edit update], concerns: %i[mediable readable submitable infoable] do
-          get 'inputServiceWorker.js', to: 'activities#input_service_worker', as: 'input_service_worker'
-        end
+        resources :activities, only: %i[show edit update], concerns: %i[mediable readable submitable infoable]
         resources :activities, only: %i[show edit update], concerns: %i[mediable readable submitable infoable], path: '/exercises', as: 'exercises'
       end
-      resources :activities, only: %i[show edit update], concerns: %i[mediable readable submitable infoable] do
-        get 'inputServiceWorker.js', to: 'activities#input_service_worker', as: 'input_service_worker'
-      end
+      resources :activities, only: %i[show edit update], concerns: %i[mediable readable submitable infoable]
       resources :activities, only: %i[show edit update], concerns: %i[mediable readable submitable infoable], path: '/exercises', as: 'exercises'
       resources :submissions, only: [:index]
       resources :activity_read_states, only: [:index]
@@ -126,7 +122,6 @@
 
     resources :activities, only: %i[index show edit update], concerns: %i[readable mediable submitable infoable] do
       member do
-        get 'inputServiceWorker.js', to: 'activities#input_service_worker', as: 'input_service_worker'
         scope 'description/:token/' do
           constraints host: Rails.configuration.sandbox_host do
             root to: 'activities#description', as: 'description'
@@ -270,6 +265,8 @@
       get 'timeseries', to: 'statistics#timeseries'
       get 'cumulative_timeseries', to: 'statistics#cumulative_timeseries'
     end
+
+    get 'inputServiceWorker.js', to: 'activities#input_service_worker', as: 'input_service_worker'
   end
 
 # For details on the DSL available within this file, see https://guides.rubyonrails.org/routing.html

package.json

@@ -21,7 +21,7 @@
     "@codemirror/language-data": "^6.4.0",
     "@codemirror/state": "^6.3.3",
     "@codemirror/view": "^6.23.1",
-    "@dodona/papyros": "2.2.0-beta.8",
+    "@dodona/papyros": "2.2.0-beta.9",
     "@dodona/pyodide-trace-library": "^2.0.7",
     "@lezer/common": "^1.2.1",
     "@lezer/highlight": "^1.2.0",

yarn.lock

@@ -1327,10 +1327,10 @@
   resolved "https://registry.yarnpkg.com/@discoveryjs/json-ext/-/json-ext-0.5.7.tgz#1d572bfbbe14b7704e0ba0f39b74815b84870d70"
   integrity sha512-dBVuXR082gk3jsFp7Rd/JI4kytwGHecnCoTtXFb7DB6CNHp4rg5k1bhg0nWdLGLnOV71lmDzGQaLMy8iPLY0pw==
 
-"@dodona/[email protected].8":
-  version "2.2.0-beta.8"
-  resolved "https://registry.yarnpkg.com/@dodona/papyros/-/papyros-2.2.0-beta.8.tgz#cea08e1b90c52ae9dd14cf7c9476742ffa6a6357"
-  integrity sha512-uQZocd/rj+gny8BUP62repJl4/ol/tsUFfymACZZ4nveobdsa+DZzlFQFprscF8NvkpPPeOzPX/yKGx5jVlN3A==
+"@dodona/[email protected].9":
+  version "2.2.0-beta.9"
+  resolved "https://registry.yarnpkg.com/@dodona/papyros/-/papyros-2.2.0-beta.9.tgz#01dab05c1cea635de3ca0328c50b4674429791c4"
+  integrity sha512-cv3mzRg/O5UABoftcLpO0+XHfdBf8lmbIop9c6EsbrAG8PJgtZaY6f8wIgYnnLtO/++V0s/Tl2dR61tCHtCh2A==
   dependencies:
     "@codemirror/autocomplete" "^6.11.1"
     "@codemirror/commands" "^6.3.1"