Production release: fix form issues, add/update jsPsych plugins, package updates #1815

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged

becky-gilbert merged 15 commits into master from develop

Nov 20, 2025

.github/dependabot.yml

-Original file line number
+Diff line change
@@ Expand Up / @@ -9,3 +9,6 @@ updates: @@
         directory: "/" # Location of package manifests
         schedule:
           interval: "daily"
+        ignore:
+          - dependency-name: "boto3"
+            update-types: ["version-update:semver-patch"]

pyproject.toml

            
                      Original file line number
                      Diff line number
                      Diff line change
                  
    @@ -5,9 +5,9 @@ description = "Add your description here"
  
    readme = "README.md"

    requires-python = "==3.13.*"

    dependencies = [

        "boto3==1.38.9",

        "boto3==1.40.52",

        "ciso8601==2.3.2",

        "django==5.2.2",

        "django==5.2.8",

        "django-ace-overlay",

        "django-bitfield==2.2.0",

        "django-bootstrap-icons==0.9.0",

    @@ -27,7 +27,7 @@ dependencies = [
  
        "djangorestframework==3.16.0",

        "djangorestframework-jsonapi==7.1.0",

        "docker==7.1.0",

        "drf-nested-routers==0.94.1",

        "drf-nested-routers==0.95.0",

        "fleep==1.0.1",

        "gevent==25.4.2",

        "google-cloud-storage==3.1.0",

    @@ -54,7 +54,7 @@ dev = [
  
        "django-dynamic-fixture==4.0.1",

        "libsass==0.23.0",

        "parameterized==0.9.0",

        "pre-commit==4.2.0",

        "pre-commit==4.3.0",

        "pyinstrument==5.0.1",

        "pyopenssl==25.0.0",

        "python-dotenv==1.0.1",

studies/templates/studies/experiment_runner/base.html

-Original file line number
+Diff line change
@@ Expand Up / @@ -48,7 +48,7 @@ <h3 class="card-subtitle my-1"> @@
                         </p>
                         {% block header %}
                         {% endblock header %}
-                        <form action="" method="post" class="form">
+                        <form method="post" class="form" id="{{ form_id|default:'experiment_runner_form' }}" action="{{ form_action|default:'' }}">
                             {% csrf_token %}
                             {% block form %}
                             {% endblock form %}
@@ Expand Down @@

uv.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

web/static/js/efp-runner.js

            
                      Original file line number
                      Diff line number
                      Diff line change
                  
    @@ -120,7 +120,7 @@ function updateCommitUpdateInfo(event) {
  
    }

    function updateLastPlayerSha() {

        const form = document.forms[0];

        const form = document.querySelector('form#experiment_runner_form');

        if (!form.last_known_player_sha.value) {

            const playerRepoUrl = document.querySelector('#id_player_repo_url').value;

    @@ -162,4 +162,4 @@ updateLastPlayerSha();
  
    document.querySelector('#id_use_generator').addEventListener("click", updateProtocolDisplay);

    document.querySelector('#update-button').addEventListener("click", updateCommitUpdateInfo);

    document.querySelector('#id_last_known_player_sha').addEventListener('keyup', updateCommitDescription);

    document.querySelector('form').addEventListener('submit', validateGenerator);

    document.querySelector('form#experiment_runner_form').addEventListener('submit', validateGenerator);

web/static/js/external-runner.js

            
                      Original file line number
                      Diff line number
                      Diff line change
                  
    @@ -1,7 +1,9 @@
  
    const form = document.querySelector('form#experiment_runner_form');

    function toggleScheduling() {

        const scheduled = document.forms[0].scheduled;

        const scheduling = document.querySelector('#id_scheduling');

        const checked_scheduling = document.querySelector('input[name="scheduling"]:checked')

        const scheduled = form.querySelector('#id_scheduled');

        const scheduling = form.querySelector('#id_scheduling');

        const checked_scheduling = form.querySelector('input[name="scheduling"]:checked');

        if (scheduled.value === "Scheduled") {

            scheduling.parentNode.classList.remove('d-none');

        } else {

    @@ -11,9 +13,9 @@ function toggleScheduling() {
  
    }

    function toggleOtherScheduling() {

        const scheduled = document.forms[0].scheduled;

        const scheduling = document.forms[0].scheduling;

        const otherScheduling = document.querySelector('#id_other_scheduling')

        const scheduled = form.querySelector('#id_scheduled');

        const scheduling = form.querySelector('#id_scheduling');

        const otherScheduling = form.querySelector('#id_other_scheduling');

        if (scheduling.value === 'Other' && scheduled.value === "Scheduled") {

            otherScheduling.parentNode.classList.remove('d-none');

        } else {

    @@ -23,9 +25,8 @@ function toggleOtherScheduling() {
  
    }

    function toggleOtherStudyPlatform() {

        const studyPlatform = document.forms[0].study_platform;

        const otherStudyPlatform = document.forms[0].other_study_platform;

        const studyPlatform = form.study_platform;

        const otherStudyPlatform = form.other_study_platform;

        if (studyPlatform.value === 'Other') {

            otherStudyPlatform.parentNode.classList.remove('d-none')

        } else {

    @@ -41,13 +42,12 @@ toggleScheduling();
  
    toggleOtherScheduling();

    toggleOtherStudyPlatform();

    /***

     * Event listeners

     */

    document.querySelector('#id_scheduled').addEventListener('click', () => {

    form.querySelector('#id_scheduled').addEventListener('click', () => {

        toggleScheduling();

        toggleOtherScheduling();

    });

    document.querySelector('#id_scheduling').addEventListener('change', toggleOtherScheduling);

    document.querySelector('#id_study_platform').addEventListener('change', toggleOtherStudyPlatform);

    form.querySelector('#id_scheduling').addEventListener('change', toggleOtherScheduling);

    form.querySelector('#id_study_platform').addEventListener('change', toggleOtherStudyPlatform);

web/static/js/jspsych-runner.js

-Original file line number
+Diff line change
@@ Expand Up / @@ -6,4 +6,4 @@ function validateExperiment(event) { @@
     /**
      * Event Listeners
      */
-    document.querySelector('form').addEventListener('submit', validateExperiment);
+    document.querySelector('form#experiment_runner_form').addEventListener('submit', validateExperiment);

web/static/js/resources.js

-Original file line number
+Diff line change
@@ Expand Up / @@ -551,6 +551,10 @@ const labsData = { @@
             {
                 "url": "https://peabody.vanderbilt.edu/departments/psych/research/research_labs/educational_cognitive_neuroscience_lab/index.php",
                 "name": "Vanderbilt Educational Cognitive Neuroscience Lab"
+            },
+            {
+                "url": "https://theccdlab.com/",
+                "name": "Vanderbilt University Computational Cognitive Development Lab"
             }
         ],
         "Texas": [
@@ Expand Down @@

web/static/js/studies-list.js

-Original file line number
+Diff line change
@@ -1,4 +1,4 @@
-    const $form = $('form');
+    const $form = $('form#studies_list_form');
     const $hideStudiesCheckbox = $form.find('input:checkbox[name=hide_studies_we_have_done]')
     const $checkboxes = $form.find('input:checkbox')
     const $dropdownSelected = $form.find('select option:selected')
@@ Expand Down @@

web/static/js/study-create.js

-Original file line number
+Diff line change
@@ Expand Up / @@ -8,7 +8,7 @@ @@
     })();
     $(document).ready(function() {
-        $('form').submit(function() {
+        $('form#study-details-form').submit(function() {
             $('#create-study-button').prop("disabled", "disabled");
         });
     });

web/static/js/study-detail.js

-Original file line number
+Diff line change
@@ Expand Up / @@ -128,9 +128,10 @@ new Clipboard('.copy-link-button'); // NOSONAR @@
     $('#private-study-link, #study-preview-link').attr('readonly', 'readonly');
-    $('form').submit(function () {
-        $('#changeStatusButton').prop("disabled", "disabled");
+    // disable the study state dropdown and submit/save button to prevent another status change while the page reloads
+    $('form#studyStateModalForm').submit(function () {
+        $('#changeStudyState').prop("disabled", "disabled");
+        $('form#studyStateModalForm button').prop("disabled", "disabled");
     });
     $(function () {
@@ Expand Down @@

web/templates/web/jspsych-study-detail.html

            
                      Original file line number
                      Diff line number
                      Diff line change
                  
    @@ -15,6 +15,9 @@
  
            <script src="https://unpkg.com/@jspsych/plugin-image-keyboard-response@2.0.0"

                    integrity="sha384-BqelFj5L0Q3ifJf9rlngrTf8zZgfZhmaGwODK7vjHchtxS/Um3LVYj58qymHDn1i"

                    crossorigin="anonymous"></script>

            <script src="https://unpkg.com/@jspsych/plugin-video-keyboard-response@2.1.0"

                    integrity="sha384-a/hZpVf76Sh4k+Do3dVTBltuX/XuRfZnokDUg7Qsw5J+pMy00lzyMX5EovruBI3M"

                    crossorigin="anonymous"></script>

            <script src="https://unpkg.com/@jspsych/plugin-html-button-response@2.0.0"

                    integrity="sha384-YkXp8JHPul+fAB8ACoBIXD4fMzweAXqwajNbmkFxKo0z4CEZJssZ5EWqMCefJs8J"

                    crossorigin="anonymous"></script>

    @@ -24,6 +27,12 @@
  
            <script src="https://unpkg.com/@jspsych/plugin-video-button-response@2.0.0"

                    integrity="sha384-u1N4HtXTAx8IPaZxRLKurCoPhFnSQ+TrF+33Lr1ORBhnRogBnU8Fd7tbPkFh1uUj"

                    crossorigin="anonymous"></script>

            <script src="https://unpkg.com/@jspsych-contrib/plugin-image-hotspots@1.0.0"

                    integrity="sha384-5FFtjOjpPAEX7u5oCl4/EIA79s5PCUgxFlQJV48+FaiDcZNkPgIULQiU2g2LEkrp"

                    crossorigin="anonymous"></script>

            <script src="https://unpkg.com/@jspsych-contrib/plugin-video-hotspots@1.0.0"

                    integrity="sha384-rt4050E4IgezDryQLHWQQ2R/MifIghArPZ09ovDSwWB6n46Kviwidtl3nMHVyEOE"

                    crossorigin="anonymous"></script>

            <script src="https://unpkg.com/@jspsych/plugin-preload@2.0.0"

                    integrity="sha384-veBuhHbf5WLQIFlG9N6a+5E/kRYJcBTDKkqJRTkc7wuGwptljsBa2fYuTseMkOBI"

                    crossorigin="anonymous"></script>

    @@ -45,11 +54,11 @@
  
            <script src="https://unpkg.com/@lookit/lookit-initjspsych@2.1.0"

                    integrity="sha384-57tffibjHG+dqyEOLLeNY18jNHuOzQPmYiOB+m20j6+/vBNP91YeP1Nb6Krk2cmk"

                    crossorigin="anonymous"></script>

            <script src="https://unpkg.com/@lookit/record@4.0.0"

                    integrity="sha384-HrMs0UB84ZN9bnwP68DgBY5GVtjziBbG2Jqw4pl3O88DDCNjfIZSilPBFjomtBtB"

            <script src="https://unpkg.com/@lookit/record@4.1.0"

                    integrity="sha384-DxWDXLMg/gkElFfpqPzd7tCXey6RPcraAB881PbJZm/LfpZbu/J8AsaT4IH3YjTR"

                    crossorigin="anonymous"></script>

            <script src="https://unpkg.com/@lookit/surveys@4.0.0"

                    integrity="sha384-l9H2U0jaAJi2bZTIkanZZuVX/nPvo8Mgf7EJrzBJPwY3JxRxlfiyb2Ol/Jst8WC1"

            <script src="https://unpkg.com/@lookit/surveys@4.0.1"

                    integrity="sha384-y5ZVd6DNQBV6mg7BLNyjgqGCXA81bqySLwFy407dhgc1UUjFaKRRqZ2X7u6MZgza"

                    crossorigin="anonymous"></script>

            <link rel="stylesheet"

                  href="https://unpkg.com/jspsych@8.0.3/css/jspsych.css"

web/templates/web/studies-list.html

-Original file line number
+Diff line change
@@ Expand Up / @@ -11,6 +11,7 @@ @@
     {% endblock head %}
     {% block content %}
         <form action
+              id="studies_list_form"
               method="post"
               class="row justify-content-center align-items-center g-lg-3">
             {% csrf_token %}
@@ Expand Down @@

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Production release: fix form issues, add/update jsPsych plugins, package updates #1815

Uh oh!

Diff view

Diff view

There are no files selected for viewing

Uh oh!

Uh oh!