From 47761d6b62793b3d9bcf0e8ab33d23258e77315d Mon Sep 17 00:00:00 2001 From: Ricky Chen Date: Tue, 14 Jan 2025 10:56:24 -0500 Subject: [PATCH 1/6] add tooltip for python autotester requirements file --- app/assets/stylesheets/common/_react_json_schema_form.scss | 4 ++++ app/javascript/Components/autotest_manager.jsx | 4 ++++ config/locales/views/automated_tests/en.yml | 1 + 3 files changed, 9 insertions(+) diff --git a/app/assets/stylesheets/common/_react_json_schema_form.scss b/app/assets/stylesheets/common/_react_json_schema_form.scss index b72e78d7ca..309720c104 100644 --- a/app/assets/stylesheets/common/_react_json_schema_form.scss +++ b/app/assets/stylesheets/common/_react_json_schema_form.scss @@ -176,4 +176,8 @@ margin-left: 170px; padding: 0.25em 0.5em; } + + .pip_requirements_file > input { + width: 300px; + } } diff --git a/app/javascript/Components/autotest_manager.jsx b/app/javascript/Components/autotest_manager.jsx index 55319c3867..83a51f84d1 100644 --- a/app/javascript/Components/autotest_manager.jsx +++ b/app/javascript/Components/autotest_manager.jsx @@ -30,6 +30,10 @@ class AutotestManager extends React.Component { pip_requirements: { "ui:widget": "textarea", }, + pip_requirements_file: { + "ui:placeholder": I18n.t("automated_tests.requirements_file"), + "ui:classNames": "pip_requirements_file", + }, }, test_data: { items: { diff --git a/config/locales/views/automated_tests/en.yml b/config/locales/views/automated_tests/en.yml index f96f6f30e9..f92d041aea 100644 --- a/config/locales/views/automated_tests/en.yml +++ b/config/locales/views/automated_tests/en.yml @@ -44,6 +44,7 @@ en: no_instructor_runnable_tests: No tests are available for instructors to run. no_results: No test results to display no_student_runnable_tests: No tests are available for students to run. + requirements_file: Upload a requirements file with the test files results: extra_malformed: "Malformed results discarded by server: \n%{extra}\n" extra_stderr: "Messages on stderr: \n%{extra}\n" From 5e8fd53c016f64e0356a9b6cd5e052344e75f07f Mon Sep 17 00:00:00 2001 From: Ricky Chen Date: Tue, 14 Jan 2025 11:30:49 -0500 Subject: [PATCH 2/6] update changelog with requirements file placeholder --- Changelog.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Changelog.md b/Changelog.md index 20dd74065b..b656e84973 100644 --- a/Changelog.md +++ b/Changelog.md @@ -6,6 +6,8 @@ ### ✨ New features and improvements +- Placeholder text for Package requirements file for Python autotester settings (#7383) + ### 🐛 Bug fixes - Ensures row selection for peer reviewer unassigning has the same validation checks as individual selections (#7274) From b87a85de88cfea595f35625456f5d40fd92a06b1 Mon Sep 17 00:00:00 2001 From: Ricky Chen Date: Tue, 14 Jan 2025 13:46:15 -0500 Subject: [PATCH 3/6] add name to contributors --- doc/markus-contributors.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/doc/markus-contributors.txt b/doc/markus-contributors.txt index d3759f1b61..d6833cfdd4 100644 --- a/doc/markus-contributors.txt +++ b/doc/markus-contributors.txt @@ -174,6 +174,7 @@ Rathusshan Kuganesan Razvan Vlaicu Rebecca Frailich Rhys Rustad-Elliott +Ricky Chen Robert Burke Robert Tan Ryan Spring From 1ae9250057b18beec244377f334b3a214aa235dd Mon Sep 17 00:00:00 2001 From: Ricky Chen Date: Tue, 14 Jan 2025 16:14:08 -0500 Subject: [PATCH 4/6] use tooltip that appears when hovering package requirements file field --- .../stylesheets/common/_react_json_schema_form.scss | 4 ++-- app/javascript/Components/autotest_manager.jsx | 10 ++++++++-- config/locales/views/automated_tests/en.yml | 3 ++- 3 files changed, 12 insertions(+), 5 deletions(-) diff --git a/app/assets/stylesheets/common/_react_json_schema_form.scss b/app/assets/stylesheets/common/_react_json_schema_form.scss index 309720c104..fda0b8d00e 100644 --- a/app/assets/stylesheets/common/_react_json_schema_form.scss +++ b/app/assets/stylesheets/common/_react_json_schema_form.scss @@ -177,7 +177,7 @@ padding: 0.25em 0.5em; } - .pip_requirements_file > input { - width: 300px; + .pip_requirements_file_title:hover { + cursor: help; } } diff --git a/app/javascript/Components/autotest_manager.jsx b/app/javascript/Components/autotest_manager.jsx index 83a51f84d1..cc0b5cac7e 100644 --- a/app/javascript/Components/autotest_manager.jsx +++ b/app/javascript/Components/autotest_manager.jsx @@ -31,8 +31,14 @@ class AutotestManager extends React.Component { "ui:widget": "textarea", }, pip_requirements_file: { - "ui:placeholder": I18n.t("automated_tests.requirements_file"), - "ui:classNames": "pip_requirements_file", + "ui:title": ( +
+ {I18n.t("automated_tests.requirements_file")} +
+ ), }, }, test_data: { diff --git a/config/locales/views/automated_tests/en.yml b/config/locales/views/automated_tests/en.yml index f92d041aea..d7d7bb22c2 100644 --- a/config/locales/views/automated_tests/en.yml +++ b/config/locales/views/automated_tests/en.yml @@ -44,7 +44,8 @@ en: no_instructor_runnable_tests: No tests are available for instructors to run. no_results: No test results to display no_student_runnable_tests: No tests are available for students to run. - requirements_file: Upload a requirements file with the test files + requirements_file: Package requirements file + requirements_file_tooltip: Upload a requirements file along with the test files results: extra_malformed: "Malformed results discarded by server: \n%{extra}\n" extra_stderr: "Messages on stderr: \n%{extra}\n" From 397fff89f5632b441e2c8f6a5c98730dfaa23394 Mon Sep 17 00:00:00 2001 From: Ricky Chen Date: Wed, 15 Jan 2025 15:05:01 -0500 Subject: [PATCH 5/6] changelog conflict fix --- Changelog.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Changelog.md b/Changelog.md index 2a4d621acc..6028d4a3d6 100644 --- a/Changelog.md +++ b/Changelog.md @@ -5,8 +5,8 @@ ### 🚨 Breaking changes ### ✨ New features and improvements -- Fix front-end content shift when an input element is focused (#7384) +- Fix front-end content shift when an input element is focused (#7384) - Placeholder text for Package requirements file for Python autotester settings (#7383) ### 🐛 Bug fixes From 6d69569bc795f31bf60107c588999f658dba811a Mon Sep 17 00:00:00 2001 From: Ricky Chen Date: Wed, 15 Jan 2025 15:06:06 -0500 Subject: [PATCH 6/6] Update changelog to match recent change --- Changelog.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Changelog.md b/Changelog.md index 6028d4a3d6..7466091658 100644 --- a/Changelog.md +++ b/Changelog.md @@ -7,7 +7,7 @@ ### ✨ New features and improvements - Fix front-end content shift when an input element is focused (#7384) -- Placeholder text for Package requirements file for Python autotester settings (#7383) +- Tooltip text for Package requirements file for Python autotester settings (#7383) ### 🐛 Bug fixes