Merge branch 'master' into refactor_proforma_import_export

# Conflicts: # spec/controllers/exercises_controller_spec.rb
2022-01-11 22:20:18 +01:00
parent 3260d8f82f 4e56ecea70
commit c5c47715b3
122 changed files with 1558 additions and 1424 deletions
--- a/app/views/admin/dashboard/show.html.slim
+++ b/app/views/admin/dashboard/show.html.slim
@ -10,33 +10,38 @@ h1 = t('breadcrumbs.dashboard.show')
 h2 Version

 div.mb-4
-  = "CodeOcean Release:"
+  = application_name
+  =< t("admin.dashboard.show.release")
+  | :
  pre = Sentry.configuration.release

 - if Runner.management_active?
  div.mb-4
    = Runner.strategy_class.name.demodulize
-    =< "Release:"
-    pre = Runner.strategy_class.release
+    =< t("admin.dashboard.show.release")
+    | :
+    pre = Admin::DashboardHelper.runner_management_release

 h2 Docker

 - if Runner.management_active?
-  h3 = t('.current')
+  h3 = t('admin.dashboard.show.current')
  .table-responsive
    table.table
      thead
        tr
          th = t('activerecord.models.execution_environment.one')
          th = t('activerecord.attributes.execution_environment.pool_size')
-          th = t('.quantity')
+          th = t('admin.dashboard.show.idleRunners')
+          th = t('admin.dashboard.show.usedRunners')
      tbody
        - ExecutionEnvironment.order(:name).each do |execution_environment|
          tr data-id=execution_environment.id
            td.name = link_to_if(policy(execution_environment).show?, execution_environment, execution_environment)
-            td.pool-size
-            td.quantity = progress_bar(0)
-  h3 = t('.history')
+            td.prewarming-pool-size
+            td.idle-runners = progress_bar(0)
+            td.used-runners
+  h3 = t('admin.dashboard.show.history')
  #graph
 - else
-  p = t('.inactive')
+  p = t('admin.dashboard.show.inactive')
--- a/app/views/code_ocean/files/_form.html.slim
+++ b/app/views/code_ocean/files/_form.html.slim
@ -4,13 +4,17 @@
    = f.text_field(:name, class: 'form-control', required: true)
  .form-group
    = f.label(:path, t('activerecord.attributes.file.path'))
-    = f.select(:path, @paths, {}, class: 'form-control')
+    | &nbsp;
+    a.toggle-input data={text_initial: t('shared.new'), text_toggled: t('shared.back')} href='#' = t('shared.new')
+    .original-input = f.select(:path, @paths, {}, class: 'form-control')
+    = f.text_field(:path, class: 'alternative-input form-control', disabled: true)
  .form-group
    = f.label(:file_type_id, t('activerecord.attributes.file.file_type_id'))
    = f.collection_select(:file_type_id, FileType.where(binary: false).order(:name), :id, :name, {selected: @exercise.execution_environment.file_type.try(:id)}, class: 'form-control')
-  .form-group
-    = f.label(:file_template_id, t('activerecord.attributes.file.file_template_id'))
-    = f.collection_select(:file_template_id, FileTemplate.all.order(:name), :id, :name, {:include_blank => true}, class: 'form-control')
+  - if FileTemplate.any?
+    .form-group
+      = f.label(:file_template_id, t('activerecord.attributes.file.file_template_id'))
+      = f.collection_select(:file_template_id, FileTemplate.all.order(:name), :id, :name, {:include_blank => true}, class: 'form-control')
  = f.hidden_field(:context_id)
  .d-none#noTemplateLabel data-text=t('file_template.no_template_label')
  .actions = render('shared/submit_button', f: f, object: CodeOcean::File.new)
--- a/app/views/code_ocean/files/show.json.jbuilder
+++ b/app/views/code_ocean/files/show.json.jbuilder
@ -1,3 +1,3 @@
 # frozen_string_literal: true

-json.extract! @file, :id, :name_with_extension
+json.extract! @file, :id, :filepath
--- a/app/views/execution_environments/show.html.slim
+++ b/app/views/execution_environments/show.html.slim
@ -1,6 +1,12 @@
-h1
-  = @execution_environment
+h1.d-inline-block = @execution_environment
+.btn-group.float-right
  = render('shared/edit_button', object: @execution_environment)
+  button.btn.btn-secondary.float-right.dropdown-toggle data-toggle='dropdown' type='button'
+  ul.dropdown-menu.dropdown-menu-right role='menu'
+    li = link_to(t('execution_environments.index.synchronize.button'), sync_to_runner_management_execution_environment_path(@execution_environment), method: :post, class: 'dropdown-item text-dark') if policy(@execution_environment).sync_to_runner_management?
+    li = link_to(t('execution_environments.index.shell'), shell_execution_environment_path(@execution_environment), class: 'dropdown-item text-dark') if policy(@execution_environment).shell?
+    li = link_to(t('shared.statistics'), statistics_execution_environment_path(@execution_environment), 'data-turbolinks' => "false", class: 'dropdown-item text-dark') if policy(@execution_environment).statistics?
+    li = link_to(t('shared.destroy'), @execution_environment, data: {confirm: t('shared.confirm_destroy')}, method: :delete, class: 'dropdown-item text-dark') if policy(@execution_environment).destroy?

 = row(label: 'execution_environment.name', value: @execution_environment.name)
 = row(label: 'execution_environment.user', value: link_to_if(policy(@execution_environment.author).show?, @execution_environment.author, @execution_environment.author))
--- a/app/views/exercises/_editor_frame.html.slim
+++ b/app/views/exercises/_editor_frame.html.slim
@ -1,4 +1,4 @@
-div class=(defined?(own_solution) ? "own-frame" : "frame") data-executable=file.file_type.executable? data-filename=file.name_with_extension data-renderable=file.file_type.renderable? data-role=file.role data-binary=file.file_type.binary? data-context-type=file.context_type data-read-only=file.read_only
+div class=(defined?(own_solution) ? "own-frame" : "frame") data-executable=file.file_type.executable? data-filename=file.filepath data-renderable=file.file_type.renderable? data-role=file.role data-binary=file.file_type.binary? data-context-type=file.context_type data-read-only=file.read_only
  - if file.file_type.binary?
    .binary-file data-file-id=file.ancestor_id
      - if file.file_type.renderable?
--- a/app/views/exercises/_file_form.html.slim
+++ b/app/views/exercises/_file_form.html.slim
@ -7,10 +7,7 @@ li.card.mt-2
    a class=['file-heading', collapsed_class] data-toggle="collapse" href="#collapse#{f.index}" aria-expanded="#{aria_expanded}"
      div.clearfix role="button"
        i class="fa" aria-hidden="true"
-        - if f.object.name.present? && f.object.file_type.present?
-          span = f.object.name_with_extension
-        - else
-          span = f.object.name
+        span = f.object.filepath
  .card-collapse.collapse class=('in' if f.object.name.nil?) id="collapse#{f.index}" role="tabpanel"
    .card-body
      - if policy(f.object).destroy? && id.present?
--- a/app/views/exercises/external_users/statistics.html.slim
+++ b/app/views/exercises/external_users/statistics.html.slim
@ -65,9 +65,9 @@ h1
                td.align-middle
                  -this.testruns.includes(:file).order("files.name").each do |run|
                    - if run.passed
-                      .unit-test-result.positive-result title=[run.file&.name_with_extension, run.output].join("\n").strip
+                      .unit-test-result.positive-result title=[run.file&.filepath, run.output].join("\n").strip
                    - else
-                      .unit-test-result.unknown-result title=[run.file&.name_with_extension, run.output].join("\n").strip
+                      .unit-test-result.unknown-result title=[run.file&.filepath, run.output].join("\n").strip
                td = @working_times_until[index] if index > 0 if policy(@exercise).detailed_statistics?
              - elsif this.is_a? UserExerciseIntervention
                td = this.created_at.strftime("%F %T")
--- a/app/views/exercises/show.html.slim
+++ b/app/views/exercises/show.html.slim
@ -49,7 +49,7 @@ ul.list-unstyled#files
        a.file-heading.collapsed data-toggle="collapse" data-parent="#files" href=".collapse#{file.id}"
          div.clearfix role="button"
            i class="fa" aria-hidden="true"
-            span = file.name_with_extension
+            span = file.filepath
      .card-collapse.collapse class="collapse#{file.id}" role="tabpanel"
        .card-body
          - if policy(file).destroy?
--- a/app/views/request_for_comments/show.html.slim
+++ b/app/views/request_for_comments/show.html.slim
@ -254,7 +254,7 @@ javascript:
  function deleteComment(commentId, editor, file_id, callback) {
    var jqxhr = $.ajax({
      type: 'DELETE',
-      url: Routes.comments_path(commentId)
+      url: Routes.comment_path(commentId)
    });
    jqxhr.done(function () {
      setAnnotations(editor, file_id);
@ -266,7 +266,7 @@ javascript:
  function updateComment(commentId, text, editor, file_id, callback) {
    var jqxhr = $.ajax({
      type: 'PATCH',
-      url: Routes.comments_path(commentId),
+      url: Routes.comment_path(commentId),
      data: {
        comment: {
          text: text
--- a/app/views/shared/_file.html.slim
+++ b/app/views/shared/_file.html.slim
@ -7,4 +7,4 @@
 - if file.teacher_defined_assessment?
  = row(label: 'file.feedback_message', value: render_markdown(file.feedback_message), class: 'm-0')
  = row(label: 'file.weight', value: file.weight)
-= row(label: 'file.content', value: file.native_file? ? link_to_if(policy(file).show?, file.native_file.file.filename, file.native_file.url) : code_tag(file.content))
+= row(label: 'file.content', value: file.native_file? ? link_to_if(policy(file).show?, file.native_file.file.filename, file.native_file.url) : code_tag(file.content, file.file_type.programming_language))