Theme the lab2 share modal #66064

molly-moen · 2025-05-22T21:02:09Z

The lab2 share dialog was not using themed variables, and required a different approach to getting the theme value from the lab than other elements on the page. This is because the share dialog is rendered via the header, which is a whole different tree from the rest of the page. Therefore, it does not exist inside the ThemeContext in lab2 labs.

The simplest solution I could find to this problem was, for lab2 labs, to copy the theme value over to the header redux whenever it changes. I did this by setting up a useEffect in ProjectContainer that listens to the theme. The header is controlled entirely by the header redux (which version of the header is visible), so it made sense to put the theme value there. I don't love that we have to duplicate the value to the header redux, if anyone has other ideas let me know! I considered passing the theme in when we set up the header, but that didn't solve for how we respond to theme changes.

Dark mode should be mostly unchanged (there may be a slightly different white text color used to align with dsco). We have a special share modal for Music Lab Jam Session, which is specifically designed for dark mode. I made it readable in light mode but adjust the blue background used since it's unlikely to be seen in light mode.

Before

After

Dark Mode

Light Mode

Links

Jira: CT-1228

Testing story

Tested locally.

PR Checklist:

Tests provide adequate coverage
Privacy and Security impacts have been assessed
Code is well-commented
New features are translatable or updates will not break translations
Relevant documentation has been added or updated
User impact is well-understood and desirable
Pull Request is labeled appropriately
Follow-up work items (including potential tech debt) are tracked and linked

sanchitmalhotra126 · 2025-05-23T16:19:59Z

apps/src/lab2/views/dialogs/ShareDialog.tsx

+  // We pull the theme from header redux because the ShareDialog is not wrapped by the lab's
+  // ThemeProvider (the header is in its own tree). We copy the lab theme to the header redux
+  // in ProjectContainer (where we do our other header management).
+  const theme = useAppSelector(state => state.header.theme);


Could we pass the theme as a prop (via arguments to shareLab2Project)?

I looked into this as well in #66019 since we're adding the sharing disabled dialog to ShareDialog in the PR. We could pass theme to header.showProjectHeader and header.showHeaderForProjectBacked in ProjectContainer.
In header.js, these two functions dispatch either showProjectHeader or showProjectBackedHeader (from headerRedux, which just sets currentHeader type.
In ProjectShare , we could pass theme to shareLab2Project. but there doesn't seem to be a way to accessthemein ProjectShare since the lab theme context is not available for this header component.

I considered that but we have to still get the theme when we call shareLab2Project, which is called from inside the header component.

Gotcha - how about storing in Lab2Registry? I'm just a little wary of adding theme to header redux since it could get manipulated by other non-lab2 components?

good idea, will update

fisher-alice

Nice solution!

sanchitmalhotra126

Nice!

fisher-alice · 2025-05-23T21:15:45Z

Nice!

Cool update! Makes sense.

commit e60e63497676ab08d19e2da6d85dc1ed1b5f9313 Merge: 1ccc1c47f41 4a3511b88b5 Author: Dayne <dayne@code.org> Date: Tue May 27 15:22:17 2025 -0700 Merge pull request #66111 from code-dot-org/TEACH-1915/fix-unit-title-in-unit-summarize Fix Unit title in Unit#summarize* methods commit 1ccc1c47f4107822740fac52edd1a0cc9af4f05b Author: Artem Vavilov <artem.vavilov.7@gmail.com> Date: Wed May 28 00:48:43 2025 +0300 fix(Alert): improve text with link layout responsiveness (#66132) commit abafb749eaec370be710241a55efa4ff9069a60b Author: Elijah Hamovitz <elijahhamovitz@gmail.com> Date: Tue May 27 14:47:09 2025 -0700 Always Use Drone Cache In PRs (#65765) * extract CI test setup operations into their own scripts * move CI scripts into their own subdirectory * update references to moved scripts * expand our existing strategy for caching the results of a git clone to also cache the results of a db seed * don't update the cache that's actually being used while we're still experimenting * temporarily target feature branch for cache clone to pick up new functionality * use working dir rather than /tmp/ to share file between steps * use new cache in UI test * use volumes rather than working directory to share cache between steps * make ui test prep script executable for use in cache pipeline * Revert "use volumes rather than working directory to share cache between steps" This reverts commit e4d49c5775f8aa63ec003e49ab776b2eeca6d4dc, for testing purposes * Revert "Revert "use volumes rather than working directory to share cache between steps"" This reverts commit c489c9e754c02aeb12553d8555404bcfc1e73636 now that we've tested without it * remove old caching strategy in favor of incremental seed from an externally-managed cache * remove lingering references to old caching strategy * gzip cache files * always use incremental seed for UI tests * entirely remove broken logic * revert temp changes now that we have some test build artifacts generated * restore caches to absolute rather than relative paths * try some manual approaches to restoring the cache data to a non-working-directory volume * try another automatic method for extracting cache to volume * fall back to manual cache restoration * Revert "fall back to manual cache restoration" This reverts commit 23aebac82d1a246937d27c31f623b82812e37100. * rather than trying to move the restored data into the volume, mount the volume at the path the data is going to be restored to * try relative paths * Revert "try relative paths" This reverts commit 692c9a065814e929df7f7d6f59ef67dcb90b6f33. * cache just dashboard db, rather than all of mysql * typo fix * serialize and deserialize dashboard data rather than just trying to cache the directory * load cache before running seed * restore update cache step now that we've updated the generated data * regenerate build artifacts with encryption key * Revert "regenerate build artifacts with encryption key" This reverts commit 512d22becc30d1b006bba53d598faf4cb4ee20bd. * do a full rather than incremental reseed, just to see how much time that adds * clean up some comments * re-sign drone * restore mysql cache to a volume * try again to figure out what breaks when we restore mysql cache to a volume * generate new artifact tarball * can't set user automatically when extracting; try setting manually after extraction * don't try to create database; it should already exist * clean up names and comments * remove temp changes * re-sign drone * test regeneration of build artifacts * remove stray debug comment * use db:setup_or_migrate in rake install to accommodate both 'restore from cache' and 'update cache' use cases * undo temp changes * use one step for both rbenv and mysql * test regeneration of build artifacts * undo temp changes * re-sign drone commit a5de1af0bcd7817f0dfc84b339094abb2ecd469f Author: Kelby Hawn <9256643+kelbyhawn@users.noreply.github.com> Date: Tue May 27 14:32:51 2025 -0700 chore(marketing): move custom components into /components/contentful directory (#66138) * chore(marketing): move custom components into /components/contentful directory * fix failing tests commit 5af9df2e5cf3ce166653a80d46f879aa42b34958 Author: Kelby Hawn <9256643+kelbyhawn@users.noreply.github.com> Date: Tue May 27 13:20:26 2025 -0700 fix(marketing): update Error page styles (#66136) commit 8f74f2db46ecdf108c9881aaf4f071d6397633fc Author: alex-m-brown <alex.brown@code.org> Date: Tue May 27 15:26:22 2025 -0400 fix modular course progress eyes test (#66134) commit 13465d83bd4984a1705a597e3010d1558e31bcfd Author: Kelby Hawn <9256643+kelbyhawn@users.noreply.github.com> Date: Tue May 27 12:23:45 2025 -0700 feat(marketing): reorganize component sidebar (#66130) * feat(marketing): reorganize component sidebar * 02: Page Structure * 03: Content Building Blocks * 04: Layout Building Blocks * 06: Dynamic Displays * 07: Curriculum * 08: Advanced * clean up * update afe tooltip desc commit 99b4a809c4a300c5c1326a06b1a7494c66718393 Merge: 8a9fa397ad0 2721c03a052 Author: Stephen Liang <stephenliang@users.noreply.github.com> Date: Tue May 27 10:17:50 2025 -0700 Merge pull request #66128 from code-dot-org/stephen/fix-docker-build fix(turbo): enable turbo in docker commit 2721c03a0525c9d274eb658138ceb4ff8e13cdd3 Author: Stephen Liang <538214+stephenliang@users.noreply.github.com> Date: Tue May 27 09:08:43 2025 -0700 fix(turbo): enable turbo in docker The previous PR implementing local turbo missed allowing the docker build to access the local turbo instance. commit 8a9fa397ad0432df1363541b5f24200c01117973 Merge: 8368715fc67 0f186957b48 Author: Ryan Driscoll <ryan.driscoll@code.org> Date: Tue May 27 10:41:54 2025 -0600 Merge pull request #66044 from code-dot-org/ryan/workshops/feat/ws-catalog-add-tooltip-for-session-dates feat: add tooltip to more sessions text in catalog commit 8368715fc67a2780960e57fc8108e08158d04075 Author: fisher-alice <107423305+fisher-alice@users.noreply.github.com> Date: Tue May 27 11:13:48 2025 -0500 [Python Lab] Move header button tooltips to bottom (#66124) [Python Lab] Move header button tooltips to bottom commit 303926946e823433a5d5f83db7d86cedfeec0d9e Merge: 1053585116a 3818696162b Author: Molly Moen <molly@code.org> Date: Tue May 27 08:40:53 2025 -0700 Merge pull request #66064 from code-dot-org/molly/theme-share-modal Theme the lab2 share modal commit 1053585116add9f61ae4e32c5b4a5f7e125a83c2 Author: Kelby Hawn <9256643+kelbyhawn@users.noreply.github.com> Date: Tue May 27 08:37:21 2025 -0700 feat(Carousel): set allowTouchMove to true by default (#66100) commit 0ad863d16e91d13a28cf32541f7a61f794821268 Author: Kelby Hawn <9256643+kelbyhawn@users.noreply.github.com> Date: Tue May 27 08:36:15 2025 -0700 Skip more pegasus ui tests on courses_eyes.feature (#66106) * skip more pegasus ui tests on courses_eyes.feature * add comments commit 72c0755bac78b68655813de01be5e9944472a0f8 Merge: 7bef9260f61 2168ff4c9a9 Author: Mike Harvey <43474485+mikeharv@users.noreply.github.com> Date: Tue May 27 11:16:08 2025 -0400 Merge pull request #66114 from code-dot-org/mike/fix-disabled [Google Blockly] set workspace.options.disabled correctly commit 7bef9260f61f6c90a9a3ed22f4a6699094a2030a Author: alex-m-brown <alex.brown@code.org> Date: Tue May 27 11:09:02 2025 -0400 Launch Modular Course URL Change (#65582) * 'modularity' - redirection from /s/ to /courses/ * Using string substitution to simplify and support more URLs * Simplify nested course URL redirection * 'bundle update rspec' to get fixes for 'and_call_original' * Using 'and_call_original' * Removing unused code * Unit tests for ScriptsController * Unit tests for LessonsController redirect * Unit tests for ScriptLevelsController redirection * Using 'Unit' instead of 'Script' * Moving queries and services to /lib * Fixing ScriptLevelsControllerTests * Using 'redirect_to_canonical_path' * Adding support for /teacher_dashboard/courses/.../units/... * Remove debugging code * Add caching for UnitGroupUnit * Using cached UnitGroupUnit methods * Using unit.unit_group_units * removed unused method * Reusing existing cached method for 'default_unit_group_units' * Removing unused 'should_cache?' method * Added documentation * Fixed documentation * Unit tests for unit_summary API * Adding isOptionSelected support for nestedUnitOverview to the TeacherNavigationBar * Unit tests for teacher_dashboard/.../courses/.../units/... * unit_position should be an integer * Addressing PR feedback * Use course_unit_path for standalone unit redirect * Refactoring Unit methods .course_link, .course_title, and .unit_group to work with Modularity * Pausing work * Fixing unit_position comparison type mismatch * Fixing URL generation for the selected section's course/unit * Fixing unit tests for expected response of section API * Single Unit course will redirect to nested URL * Updating SectionTest with new unitPosition values * Removing redundant test configurations * Adding experiments.MODULARITY to the frontend * /courses/... pages now show nested course URLs for 'Go to Unit' buttons * progress bubbles use nested URLs * lessons_controller uses nested course paths * Migrate more unit.rb paths to be nested in a course * Adding unit_group_unit everywhere * View Unit Overview button supports nested URL * Fixing broken lesson plan page * Nested URLs in activity_sections * /courses/standards supports nested URLs * BubbleChoice, Try Now, Student Lesson Plan, and Unit Overview buttons support nested URLs * My Courses on dashboard now shows the nested URLs * valid_course_offerings API returns nested URLs * Add Jira to peer_review TODO * Rename 'script' to 'unit' * Adding TODO TEACH-1864 * Adding TODO TEACH-1865 * Adding TODO TEACH-1866 * Adding TODO TEACH-1864 * Fixing progress API call when the modularity experiement is off * Script Overview page will redirect to /s/ if the modularity experience is off * Fixing test/unit/code-studio/components/progress/UnitOverviewTopRowTest.jsx * Fixing tests to supply a path to CourseScript * Forward 'modularity' DCDO value to front-end * Fixing some UI tests * Fixing DCDO * Using keyword parameters for unit_group_unit and fixing section_text_responses API * Fixed 'params' keyword parameter usage * acquisition products tests * code tools tests * foundations tests * javalab tests * platform tests * star labs tests * step definitions tests * student learning tests * teacher tools tests * xteam and misc. tests * Added error handling for Queries::Courses.get_course_context * update steps to use new url structure * Fixing unit_group_unit.unit_group usage * match on /teacher_dashboard not teacher_dashboard * Using origin_unit_group rather than the 'first' one * Fixing a lot of unit tests, mostly related to caching * Adding nil checks * Fixing unit tests * add navigating within modular course test * Fixed number of db queries * Adding missing section_id query param * turn on modularity dcdo * fix unit tests * fix ui tests * fix more tests [test all] * fix eyes tests [test all] * Fixing 'modularity' DCDO value being passed to front-end * Changing param name to unit_name_or_id * Update route docs in lessons_controller * .unit_group_unit falls back to orignal_unit_group * Look for the next unit in the same unit group * Adding .get_unit_context tests * Testing unit_id passed to .get_course_context * Added cache test for .get_unit_context * Add error handling for 'nil' .get_unit_context * The 'Continue' button now links to a nested URL * Using nested URL for Unit link in MiddleHeader * lesson_extras_level_url in MiddleHeader uses nested URL * fix unit test * use script_next_path * Use nested unit path in TeacherNavigationBar if modularity is enabled * Adding canonical_url helper function * Revert "Adding canonical_url helper function" This reverts commit 316f660210587a9ad0324823b102acdd19b42240. * Adding nested redirect for scripts_controller :vocab, :resources, :code, :standards * scripts_controller can now redirect to nested urls in teacher_dashboard * SelfPacedProgressTable now uses nested URLs * fix ui test * Adding unitPosition to test data * Using a shared library to look up course context in script_levels_controller * Add handling for fake Units created by get_unit_family_redirect_for_user * fix unit test [test all] * Passing unit_name_or_id explicitly to canonical_path * remove todos * Delete dashboard/test/ui/features/platform/hamburger.feature * Update cookie_banner.feature * fix cookie banner eyes test [test all] --------- Co-authored-by: Dayne <dayne@code.org> commit 949f4f6911a3ff7e6708a1846a9b2bc433177946 Author: Sanchit Malhotra <85528507+sanchitmalhotra126@users.noreply.github.com> Date: Tue May 27 11:04:59 2025 -0400 Fix assessment level progress update in Lab2 (#66101) commit 0f186957b4825cde2e95f39372bad6b5817ab522 Author: Ryan Driscoll <driscollrp@gmail.com> Date: Thu May 22 12:44:56 2025 -0600 feat: add tooltip to session date detail row commit aedc6b500fe0aaf03f8011d69ef14bd56ecf2b84 Author: Mark Barnes <mark.barnes@code.org> Date: Tue May 27 09:17:27 2025 -0500 Section avatar editor backend and tests (#65979) * add avatar edit dialog * fix * update styling and add all elements * select and save working * PR updates * update avatar select button text * unit test and accessibility updates * accessibility updates * accessibility updates * unit test updates * accessibility updates and bug fixes * bug fix * remove unnecessary id * PR updates * dedupe * bug fixes * bug fixes * bug fix * test fix commit 2c2a01ee17954e8406d61f74602a27211d921c75 Merge: 454212b76a0 59822653d3f Author: Stephen Liang <stephenliang@users.noreply.github.com> Date: Tue May 27 06:47:02 2025 -0700 Merge pull request #66113 from code-dot-org/stephen/turbo-cache fix(turbo): prevent turbocache from infinitely growing commit 454212b76a084a9851479d4e533ac197344fa1dc Merge: 9dd1a430c6f 2f120bc13fd Author: Code.org Deploy Systems <dev@code.org> Date: Mon May 26 21:35:26 2025 -1000 Merge pull request #66122 from code-dot-org/dts_candidate_2025-05-27 DTS (Levelbuilder > Staging) [robo-dts] commit 2f120bc13fdb5935ea9364870d97cc69a52f779e Merge: 9dd1a430c6f 80fa62fbb74 Author: Continuous Integration <dev@code.org> Date: Tue May 27 07:35:19 2025 +0000 Merge remote-tracking branch 'origin/levelbuilder' into dts_candidate_2025-05-27 commit 9dd1a430c6f87e5792e25919270695a97a5b386c Author: Continuous Integration <dev@code.org> Date: Tue May 27 07:30:27 2025 +0000 staging content changes (-robo-commit) commit 80fa62fbb74ed126686a8c288d14bfda38423907 Author: Continuous Integration <dev@code.org> Date: Tue May 27 07:30:12 2025 +0000 levelbuilder content changes (-robo-commit) commit 4c812db2f79b6186518feb04f582c67f1ff54075 Merge: 18c3c0b4f6b 4f6c422a452 Author: Code.org Deploy Systems <dev@code.org> Date: Sun May 25 23:25:42 2025 -1000 Merge pull request #66118 from code-dot-org/dtl_candidate_105dc2fb commit 4f6c422a452f0ae0aebc64acaf2ab0b8d69bd7d1 Merge: 18c3c0b4f6b 105dc2fbfd6 Author: Continuous Integration <dev@code.org> Date: Mon May 26 09:20:22 2025 +0000 Merge commit '105dc2fb' into dtl_candidate_105dc2fb commit f3105a5575258ead93f2059a61ab49ce37e6bbda Merge: 31427f70a14 6b2c2d45300 Author: Code.org Deploy Systems <dev@code.org> Date: Sun May 25 21:42:00 2025 -1000 Merge pull request #66116 from code-dot-org/dts_candidate_2025-05-26 DTS (Levelbuilder > Staging) [robo-dts] commit 6b2c2d45300e824ece6d7ff55f7e06365d7e5cb6 Merge: 31427f70a14 18c3c0b4f6b Author: Continuous Integration <dev@code.org> Date: Mon May 26 07:41:53 2025 +0000 Merge remote-tracking branch 'origin/levelbuilder' into dts_candidate_2025-05-26 commit 31427f70a14c59804681038e2884c6d87736ccb5 Author: Continuous Integration <dev@code.org> Date: Mon May 26 07:30:26 2025 +0000 staging content changes (-robo-commit) commit 18c3c0b4f6bd0f017570dfb2f376a0602a79993d Author: Continuous Integration <dev@code.org> Date: Mon May 26 07:30:12 2025 +0000 levelbuilder content changes (-robo-commit) commit bf20eb432b738ad717e0fab3af344ac766481e88 Merge: ae11542de5a 6bce6d43717 Author: Dayne <dayne@code.org> Date: Fri May 23 17:57:55 2025 -0700 Merge pull request #66107 from code-dot-org/TEACH-1915/fix-unit-numbering Fixing modular Unit numbering on CourseOverview page commit 2168ff4c9a964fe21cd9c9c29dd478941f82334f Author: Mike Harvey <mike.harvey@code.org> Date: Fri May 23 20:16:04 2025 -0400 set workspace.options.disabled correctly commit 59822653d3f419812b7805cee34ff6765978da12 Author: Stephen Liang <538214+stephenliang@users.noreply.github.com> Date: Fri May 23 16:51:42 2025 -0700 fix(turbo): prevent turbocache from infinitely growing commit 166a943845e62d75370e6ffb181d4d73b0c9f8ff Merge: 83a1ea6f3de ecdcdc3aa2c Author: carl-codeorg <131809324+carl-codeorg@users.noreply.github.com> Date: Fri May 23 16:24:38 2025 -0700 Merge pull request #66110 from code-dot-org/dtl_candidate_3241cba6 DTL (Test > Levelbuilder: 3241cba6) commit ecdcdc3aa2c8da9178bf79125c670ea206b16523 Merge: 3241cba6dfd 83a1ea6f3de Author: carl-codeorg <131809324+carl-codeorg@users.noreply.github.com> Date: Fri May 23 16:22:56 2025 -0700 Merge branch 'levelbuilder' into dtl_candidate_3241cba6 commit 4a3511b88b5fa297d143342dc19808fc7442206c Author: Dayne <dayne@code.org> Date: Fri May 23 16:12:30 2025 -0700 Fix Unit title in Unit#summarize* methods commit ae11542de5aad7fc2f7f228006ecf3c7a00fb5af Merge: 4d6a35ef902 ba65447739f Author: Turner Riley <56283563+TurnerRiley@users.noreply.github.com> Date: Fri May 23 18:19:26 2025 -0400 Merge pull request #66105 from code-dot-org/add-time-to-flaky-regional-workshop-test Give flaky Regional Workshop Catalog frontend test more time to complete commit 6bce6d43717171dba30d0bd74208637ba72c216f Author: Dayne <dayne@code.org> Date: Fri May 23 15:16:55 2025 -0700 Fixing module Unit numbering on CourseOverview page commit ba65447739f68c6b722e8490fd461fc3c0a76f30 Author: Turner Riley <turner.riley@code.org> Date: Fri May 23 18:06:09 2025 -0400 add time to flaky regional workshop test commit 4d6a35ef90251ad39e626fd5d8fdc00d87b3238c Author: Brendan Reville <breville@users.noreply.github.com> Date: Fri May 23 15:05:46 2025 -0700 AI Tutor: Python Lab URL parameter (#66075) * AI Tutor: Python Lab URL parameter * Check before running an ask on run/validate commit d3ab6841750b4ce3bac240babc689635987f9ed3 Merge: b163d9821de 286514e7dab Author: Stephen Liang <stephenliang@users.noreply.github.com> Date: Fri May 23 15:03:00 2025 -0700 Merge pull request #66092 from code-dot-org/add-farsi-redirects Add farsi redirects commit b163d9821de69473dd592eb24ec0c6c8e77c9338 Merge: 15b974ae981 483c51cf37c Author: Molly Moen <molly@code.org> Date: Fri May 23 14:45:04 2025 -0700 Merge pull request #66068 from code-dot-org/molly/misc-python-theming Small python lab theming updates commit 105dc2fbfd6ba27b2e43882dea4c1903aa9c0a0c Merge: 3241cba6dfd 15b974ae981 Author: Code.org Deploy Systems <dev@code.org> Date: Fri May 23 11:20:18 2025 -1000 Merge pull request #66103 from code-dot-org/staging commit 15b974ae981fa8d057888198e8644ff3dff15acd Author: Eric Aderhold <eric.aderhold@code.org> Date: Fri May 23 14:19:06 2025 -0700 Add AI FAB to level pages, refactor chat API (#65860) * Add AI FAB to level pages, refactor chat API * Fix AiDiffChatTest * Don't show FAB when tutor is shown commit a62063276e2dc1859854a80dd25753acb2fe2c32 Merge: a7039d09106 b5c4913a5e0 Author: Turner Riley <56283563+TurnerRiley@users.noreply.github.com> Date: Fri May 23 17:14:25 2025 -0400 Merge pull request #66063 from code-dot-org/split-national-regional-workshops-on-catalog Split National/Regional workshop sections and add zip error message commit a7039d09106f888de2cca887dd7cf4d8175c211c Merge: beda94f2ad3 d73e474331d Author: Turner Riley <56283563+TurnerRiley@users.noreply.github.com> Date: Fri May 23 16:49:28 2025 -0400 Merge pull request #66028 from code-dot-org/regional-workshop-catalog-bug-bash-fixes Quick Regional Workshop Catalog bug bash feedback fixes commit beda94f2ad3b9ac8d8e0c576f36fb7002b2df8f5 Author: Sanchit Malhotra <85528507+sanchitmalhotra126@users.noreply.github.com> Date: Fri May 23 13:47:13 2025 -0700 AI Chat: fix starter assets upload dialog overlap (#65862) * AI Chat: fix starter assets upload dialog overlap * Include script levels controller fix commit 3818696162b0b3b6ad4b895b8c9db5b55a5e64de Author: Molly Moen <molly@code.org> Date: Fri May 23 13:34:50 2025 -0700 clean up commit 51234266e4f1851189be6cb6fa00a1dda051ba8a Author: Molly Moen <molly@code.org> Date: Fri May 23 13:30:45 2025 -0700 move data to lab2registry commit 483c51cf37c95509426a42c2b09f506994c530fb Author: Molly Moen <molly@code.org> Date: Fri May 23 13:14:06 2025 -0700 fix unit test commit 11552efd62a3f6675cc500cac0705f806b7f673a Author: Kaitie O <kaitie@code.org> Date: Fri May 23 15:06:29 2025 -0500 Re-enable Safari test (#65912) * Remove reference to teacher tool bar in test * added a test for on the unit page * add cookie * fix safari issue * fix safari issue commit e913a5aedae137d2c82175b6ebe64c5fb7af5747 Merge: 4b93f169045 740c37bb8da Author: Ryan Driscoll <ryan.driscoll@code.org> Date: Fri May 23 13:54:05 2025 -0600 Merge pull request #65993 from code-dot-org/ryan/school-association/fix/clear-bad-school-info fix(school association): prompt affected users to re-submit school info commit 3241cba6dfd0670abbcc36bf8c428fae0e7eab0f Merge: 568dbb7822e 4b93f169045 Author: Code.org Deploy Systems <dev@code.org> Date: Fri May 23 09:12:18 2025 -1000 Merge pull request #66098 from code-dot-org/staging commit b5c4913a5e0e0a1c0b7d146b27dcdaa816c61acb Merge: 2cb9246c55c d73e474331d Author: Turner Riley <turner.riley@code.org> Date: Fri May 23 14:47:35 2025 -0400 merge in staging commit d73e474331dc7e316886067322ab2b5a56d30a2a Author: Turner Riley <turner.riley@code.org> Date: Fri May 23 14:42:21 2025 -0400 move into function commit 2cb9246c55c2585f83fcce8afa4637ed580bf21a Author: Turner Riley <turner.riley@code.org> Date: Fri May 23 14:40:28 2025 -0400 move logic into function commit b85d85ad0dbd1f91527045fcc21cbc029ebb21b1 Merge: 9d1ff7230c1 242ac3063a7 Author: Turner Riley <turner.riley@code.org> Date: Fri May 23 14:18:54 2025 -0400 Merge branch 'regional-workshop-catalog-bug-bash-fixes' into split-national-regional-workshops-on-catalog commit 242ac3063a766ff0ded06f3084450713fcdd6548 Author: Turner Riley <turner.riley@code.org> Date: Fri May 23 14:16:57 2025 -0400 fix private method bug commit 4b93f169045dfdd880a616434d7f158ea2996657 Merge: 9be317d2485 059f936edb8 Author: Mike Harvey <43474485+mikeharv@users.noreply.github.com> Date: Fri May 23 14:13:43 2025 -0400 Merge pull request #66091 from code-dot-org/mike/trashcan-weight [Google Blockly] Fix trashcan weight commit 9d1ff7230c1bae7b946d9145ec1cccdd2a9e56ab Author: Turner Riley <turner.riley@code.org> Date: Fri May 23 14:08:58 2025 -0400 match timing behavior commit 73b0bfddd53867c288c32348e49c4f01df8c09e4 Merge: 97a8823a149 95a25c48206 Author: Turner Riley <56283563+TurnerRiley@users.noreply.github.com> Date: Fri May 23 14:07:08 2025 -0400 Merge branch 'regional-workshop-catalog-bug-bash-fixes' into split-national-regional-workshops-on-catalog commit 95a25c48206684e8e0a23f2fe53b4aeb65a8ea4d Author: Turner Riley <turner.riley@code.org> Date: Fri May 23 13:54:47 2025 -0400 convert start to workshop time zone or dont default to chicago commit 9be317d24859edb1094bd5d4d45c80366f1b52a1 Author: carl-codeorg <131809324+carl-codeorg@users.noreply.github.com> Date: Fri May 23 10:52:42 2025 -0700 skip gdpr test (#66094) commit 58047114b898a65936093c875db675ec70a7e9d8 Merge: e0993dca27b 59f598367c7 Author: Mike Harvey <43474485+mikeharv@users.noreply.github.com> Date: Fri May 23 13:47:07 2025 -0400 Merge pull request #66079 from code-dot-org/mike/select-event-early-return [Music] Early return for block selected events commit e0993dca27b05ed77c9617194f793d4e1a5fd18f Author: Kelby Hawn <9256643+kelbyhawn@users.noreply.github.com> Date: Fri May 23 10:41:35 2025 -0700 Remove or skip more Pegasus ui tests (#66090) * remove or skip pegasus ui tests * put homepage tests back commit 02ad86f4b6bf4129e6a0ac643818c3865723fd7a Merge: d085cbfeaa5 8be02aac788 Author: Turner Riley <turner.riley@code.org> Date: Fri May 23 13:31:15 2025 -0400 Merge branch 'staging' into regional-workshop-catalog-bug-bash-fixes commit 8be02aac7889a251ac3a5bdd734fd62b680376a4 Author: Artem Vavilov <artem.vavilov.7@gmail.com> Date: Fri May 23 20:14:16 2025 +0300 CMS-722: Fix flaky HeaderTest (#66088) commit 035bafb007d04adfd56e6de1bade04d0c9327ca8 Merge: 937824830e4 5a27e0568e6 Author: Mike Harvey <43474485+mikeharv@users.noreply.github.com> Date: Fri May 23 12:30:30 2025 -0400 Merge pull request #66080 from code-dot-org/mike/focus-outline [Google Blockly] No path outline for focused blocks commit 286514e7dabf308eb925a8da4d27fa33586a836d Author: Dani <dani@code.org> Date: Fri May 23 12:25:14 2025 -0400 Add farsi redirects commit 937824830e4a5629b6956dabb7a0ccd36a11608e Author: Cassi Brenci <cassi.brenci@code.org> Date: Fri May 23 09:17:59 2025 -0700 Lab2: Change white-space handling for instructions panel (#65834) commit 49f4495b1b0cfbca9e51bca31f794838bbae7387 Merge: 06d31f4e5c8 a8e9d0ef590 Author: Stephen Liang <stephenliang@users.noreply.github.com> Date: Fri May 23 09:04:07 2025 -0700 Merge pull request #66000 from code-dot-org/stephen/newrelic feat(newrelic): add new relic browser commit 059f936edb8e4bd1ca352c70c78e1b78ead687ef Author: Mike Harvey <mike.harvey@code.org> Date: Fri May 23 11:55:25 2025 -0400 [Google Blockly] Fix trashcan weight commit 06d31f4e5c8f1872152f73e03d2e33c20c5b257d Merge: d32fa09f28e ae61222fa23 Author: Dayne <dayne@code.org> Date: Fri May 23 08:32:23 2025 -0700 Merge pull request #66062 from code-dot-org/TEACH-1538/all-nested-urls-attempt-3 3rd attempt - Migrate /s/... URLs to /courses/.../units/... "nested URLs" commit 568dbb7822e1262f607937816337acbdd4755dfc Merge: 2fd09ffd975 d32fa09f28e Author: Code.org Deploy Systems <dev@code.org> Date: Fri May 23 05:26:18 2025 -1000 Merge pull request #66089 from code-dot-org/staging commit d32fa09f28e6e24312284ce4528a8f626c43a7ff Author: Kelby Hawn <9256643+kelbyhawn@users.noreply.github.com> Date: Fri May 23 08:24:12 2025 -0700 Update menu icons on Headers (#66030) * remove minus icon from ProjectsMenu.tsx * update expandable menus to use chevrons commit 223e13002c1091abcc8c516307b193b56eac9dc3 Author: Kelby Hawn <9256643+kelbyhawn@users.noreply.github.com> Date: Fri May 23 08:21:34 2025 -0700 feat(HeroBanner): add hideImageOnSmallScreen prop (#66055) * feat(HeroBanner): add hideImageOnSmallScreen prop * add to Contentful * clean up commit 404bd5fa7664b6dd133281c9ce4767bd13559ab2 Merge: e3afb0138f0 7ec0bee1673 Author: Stephen Liang <stephenliang@users.noreply.github.com> Date: Fri May 23 08:20:14 2025 -0700 Merge pull request #66086 from code-dot-org/stephen/fix-cache-time fix(cache): update cache time in view response function commit a8e9d0ef5906fc77f339c69f5b6608fd8c8cc776 Author: Stephen Liang <538214+stephenliang@users.noreply.github.com> Date: Fri May 23 08:17:57 2025 -0700 fix env var on marketing stack commit e3afb0138f02aa56dc97dd12851fd175b29e8830 Merge: b3567603f7a 0fdef8a2e1f Author: Stephen Liang <stephenliang@users.noreply.github.com> Date: Fri May 23 08:10:31 2025 -0700 Merge pull request #66084 from code-dot-org/dmcavoy-patch-3 Update next.config.ts commit b3567603f7adec2b29ecafa9d2594ba2cec30aca Merge: df526552848 b1849de9527 Author: Bethany Connor <46464143+bethanyaconnor@users.noreply.github.com> Date: Fri May 23 10:26:38 2025 -0400 Merge pull request #66056 from code-dot-org/bethany/update-aif-homepage-banner-link Update AIF homepage banner link commit 59f598367c78fd4771a6d5eba645fc97dd1ae9ab Merge: 0543fe28772 df526552848 Author: Mike Harvey <mike.harvey@code.org> Date: Fri May 23 10:02:53 2025 -0400 Merge branch 'staging' into mike/select-event-early-return commit 5a27e0568e6510d09dfd8403c3409d57e0458a03 Merge: 56a9385dd23 df526552848 Author: Mike Harvey <mike.harvey@code.org> Date: Fri May 23 10:02:37 2025 -0400 Merge branch 'staging' into mike/focus-outline commit df526552848471651f2abec573e7e2944f2966c3 Merge: 4c871c11ecd 96664e92604 Author: Mike Harvey <43474485+mikeharv@users.noreply.github.com> Date: Fri May 23 10:02:10 2025 -0400 Merge pull request #66087 from code-dot-org/mike/editor_type remove editor_type from programming environment files commit 96664e926049dd6f90583d250b1546f261c7604a Author: Mike Harvey <mike.harvey@code.org> Date: Fri May 23 09:55:36 2025 -0400 remove editor_type from programming environment files commit 7ec0bee167319c3f386bb766c2b883aaf76e8495 Author: Stephen Liang <538214+stephenliang@users.noreply.github.com> Date: Fri May 23 06:52:42 2025 -0700 fix(cache): update cache time in view response function commit 0fdef8a2e1f1caaaeaa8fe6630de10e5e87ee5ea Author: Dani LaMarca <dani@code.org> Date: Fri May 23 09:14:44 2025 -0400 Update next.config.ts commit 2fd09ffd975209a89c047bd22f57e403f2747c8c Merge: dd2e4763598 4c871c11ecd Author: Code.org Deploy Systems <dev@code.org> Date: Fri May 23 02:54:19 2025 -1000 Merge pull request #66082 from code-dot-org/staging commit 56a9385dd23a77f1696da282018ca2e8d9b11fe3 Author: Mike Harvey <mike.harvey@code.org> Date: Fri May 23 08:40:11 2025 -0400 [Google Blockly] No path outline for focused blocks commit 0543fe287727970b84e48348e9e2a3155ca4bb0b Author: Mike Harvey <mike.harvey@code.org> Date: Fri May 23 08:09:28 2025 -0400 [Music] Early return for block selected events commit 83a1ea6f3def356e793acd00cb2f7d2bda835ead Merge: 211e263395b 86780a894df Author: Code.org Deploy Systems <dev@code.org> Date: Thu May 22 23:25:36 2025 -1000 Merge pull request #66077 from code-dot-org/dtl_candidate_b37fdce6 commit 86780a894dfbec1cb929e3b05346843c1fac62eb Merge: 211e263395b b37fdce6889 Author: Continuous Integration <dev@code.org> Date: Fri May 23 09:20:25 2025 +0000 Merge commit 'b37fdce6' into dtl_candidate_b37fdce6 commit 4c871c11ecd8bc7eae40f37c1156475ee1519050 Merge: 7ee1804f06c 6f5cf98b3eb Author: Code.org Deploy Systems <dev@code.org> Date: Thu May 22 21:35:36 2025 -1000 Merge pull request #66076 from code-dot-org/dts_candidate_2025-05-23 DTS (Levelbuilder > Staging) [robo-dts] commit 6f5cf98b3ebb875d85e010dca32dc505fb139427 Merge: 7ee1804f06c 211e263395b Author: Continuous Integration <dev@code.org> Date: Fri May 23 07:35:27 2025 +0000 Merge remote-tracking branch 'origin/levelbuilder' into dts_candidate_2025-05-23 commit 7ee1804f06c72b5efac78957b38212168c26522f Author: Continuous Integration <dev@code.org> Date: Fri May 23 07:30:25 2025 +0000 staging content changes (-robo-commit) commit 211e263395b75e055b2cc8a353859fb3b7cfa96b Author: Continuous Integration <dev@code.org> Date: Fri May 23 07:30:12 2025 +0000 levelbuilder content changes (-robo-commit) commit ae61222fa23339e15945ebe2c6a019199518f6e7 Author: Dayne <dayne@code.org> Date: Thu May 22 23:46:39 2025 -0700 Add UnitGroupUnit#cached_unit_group and use it in Unit.summarize commit 48698ebdcef47e6fe3e3298b393d23b7e3541008 Merge: ecd48b17576 3863b3fde55 Author: levadadenys <levada.denys@gmail.com> Date: Fri May 23 08:59:03 2025 +0300 Merge pull request #66007 from code-dot-org/denys/cms/cms-696-2 [CMS-696] Create definitions to make action blocks work with videos commit ecd48b175769414cc29aedc12b15cb638df2a59a Merge: 84cca67c560 3e01badc6d9 Author: levadadenys <levada.denys@gmail.com> Date: Fri May 23 08:58:33 2025 +0300 Merge pull request #66047 from code-dot-org/denys/dsco/update-colors-1 DSCO Update colors commit 84cca67c560cb7f9e0c7cb979203808cdfc29cd0 Author: Hannah Bergam <hannahbergam@gmail.com> Date: Thu May 22 21:18:38 2025 -0700 Making WithTooltip update position dynamically (#65142) * progress toward dynamic overflow * so so much closer * feat(tooltip): implement direction flip when tooltip is positioned outside of screen * feat(tooltip): simplify tooltip position recalculation calls logic * feat(common): add 'none direction' to ComponentPlacementDirection * feat(tooltip): add 'none' direction option for tooltips * restore ensure tooltip stays within the viewport logic * feat(popover): ensure proper direction handling * minor update of NoneDirectionTooltip story position and description * lint fixes * fix failing drone * Fix(Tooltip): Add hideTail prop (#66052) * add noTail prop * change prop name, add story * remove !important, add story and unit tests * add comment for new prop --------- Co-authored-by: denyslevada <levada.denys@gmail.com> Co-authored-by: fisher-alice <107423305+fisher-alice@users.noreply.github.com> commit 318f380f80c02cbc7d07243cab4e1209ea20340f Merge: 2b2d919df9f c6df3831fdd Author: Stephen Liang <stephenliang@users.noreply.github.com> Date: Thu May 22 18:55:45 2025 -0700 Merge pull request #66074 from code-dot-org/dmcavoy-patch-2 Update next.config.ts commit 595fa6e2e3da9390de492a59e11adccf4b89cbfb Author: Dayne <dayne@code.org> Date: Thu May 22 18:12:58 2025 -0700 Fixing 'Go to Unit' links on CourseOverview page in teacher dashboard commit bd8e75d318d93ba9b241d8c10969f23188cde08a Author: Dayne <dayne@code.org> Date: Thu May 22 17:42:04 2025 -0700 Adding nested URL stupport for section select commit c6df3831fddde7bbb16ede4b48eaa8fcdb607deb Author: Dani LaMarca <dani@code.org> Date: Thu May 22 21:00:51 2025 -0400 Update next.config.ts commit 2b2d919df9f2bd511723a9f69ec9010f1503be31 Author: Artem Vavilov <artem.vavilov.7@gmail.com> Date: Fri May 23 03:42:58 2025 +0300 feat(marketing): add editorial cards to /all-the-things (#66016) CMS-593 commit 186ddcfae6cde3e5ec60e5edd27f98ea2fae73f7 Author: Brendan Reville <breville@users.noreply.github.com> Date: Thu May 22 17:13:29 2025 -0700 Music: enable play tune (#65972) * Music: tune enable * Add play tune to end of /s/music-jam-2024 * Report analytic on block usage * Loc button text & add analytic event * Update analytics event commit fd5b71539b169d2ec2207228c6c7528538cc699f Merge: 149c9b5f70e 8dca051fed6 Author: Mike Harvey <43474485+mikeharv@users.noreply.github.com> Date: Thu May 22 19:53:14 2025 -0400 Merge pull request #66070 from code-dot-org/sanchit/music-blockly-select Music: use addSelect/removeSelect to avoid recursion commit 97a8823a1490cfcb68f700a4e929b529d3181901 Author: Turner Riley <turner.riley@code.org> Date: Thu May 22 19:46:38 2025 -0400 fix time test commit dd2e4763598cfa69319196ef20002b5b886aea3e Merge: b37fdce6889 149c9b5f70e Author: Code.org Deploy Systems <dev@code.org> Date: Thu May 22 13:46:18 2025 -1000 Merge pull request #66071 from code-dot-org/staging commit 4edfb2899bdefc9280b1effe4498f461e13b2f8b Merge: ef6a80028cb d085cbfeaa5 Author: Turner Riley <turner.riley@code.org> Date: Thu May 22 19:45:25 2025 -0400 fix merge conflict commit 8dca051fed694eb151f3768f37dbfa19dc90eb30 Author: Sanchit Malhotra <sanchit@code.org> Date: Thu May 22 16:43:27 2025 -0700 Music: use addSelect/removeSelect to avoid recursion commit d085cbfeaa514798d0ce85cd2f770faec5ed698d Merge: cb1fa418b9e 149c9b5f70e Author: Turner Riley <turner.riley@code.org> Date: Thu May 22 19:28:22 2025 -0400 merge in staging commit cb1fa418b9e995f9b63a27d8cf5e06ef5d5f2016 Author: Turner Riley <turner.riley@code.org> Date: Thu May 22 19:27:10 2025 -0400 fix merge conflict commit 149c9b5f70ec89db9cd6bee53004a742b0b52ca7 Author: Kelby Hawn <9256643+kelbyhawn@users.noreply.github.com> Date: Thu May 22 15:39:38 2025 -0700 chore(marketing): update Tools heading in CurriculumSnapshot (#66059) * chore(marketing): update Tools heading in CurriculumSnapshot * fix failing test commit 861a019283bd85783166de63ee8a0b7ff2761be5 Author: Turner Riley <turner.riley@code.org> Date: Thu May 22 17:44:36 2025 -0400 adjust to timezone commit ef6a80028cb924277c84187fb83abc23e4344c6e Author: Turner Riley <turner.riley@code.org> Date: Thu May 22 17:32:11 2025 -0400 update frontend tests commit be474aa7b74564ce2cb0bec5ba05f49221160465 Author: Molly Moen <molly@code.org> Date: Thu May 22 14:21:39 2025 -0700 purple buttons in modal commit 04440443a9978485472149d08da631e8eb5885c7 Author: Dayne <dayne@code.org> Date: Thu May 22 13:36:51 2025 -0700 Query directly for the User rather than looping through all script_levels and querying each user commit c6d10e8a37f0747ec5a1e1ce93f8730309f7393a Author: Molly Moen <molly@code.org> Date: Thu May 22 14:19:03 2025 -0700 update picker to theme correctly commit b7a7c0f073255bc511d6567edc5f5d560de237b8 Author: Molly Moen <molly@code.org> Date: Thu May 22 14:10:46 2025 -0700 fix validate button color commit c1aec0966bf67e293f3937840d26fdc5ed1609ba Author: Molly Moen <molly@code.org> Date: Thu May 22 13:56:04 2025 -0700 undo changes to ProjectShare commit 3d7093e7fbdd2e6168ee27307ad27d2c39bf73de Author: Molly Moen <molly@code.org> Date: Thu May 22 13:52:22 2025 -0700 clean up and add comment commit 65f74c6d93909a5f811daf0d512a6e5c62319b3b Author: Dani LaMarca <dani@code.org> Date: Thu May 22 16:46:53 2025 -0400 Update next.config.ts (#66060) commit fe655d8579e98c36ebc4b5d519db576ed0f63344 Author: Turner Riley <turner.riley@code.org> Date: Thu May 22 16:43:43 2025 -0400 undo accidental change to course offerings controller commit b8c95e88ea5ddfa8c63e2f282c3137e1b373f717 Author: Turner Riley <turner.riley@code.org> Date: Thu May 22 16:43:13 2025 -0400 split sections commit 5648f7f37d02398485dea0794589e488afd6582b Author: Dayne <dayne@code.org> Date: Thu May 22 13:33:39 2025 -0700 Revert "Revert "2nd attempt - Migrate /s/... URLs to /courses/.../units/... "nested URLs""" This reverts commit f1d99d22ffa79524087a359915937d9720baf032. commit b37fdce68897eaab1ad06e49f967ae575f822949 Merge: f9f0b8d33c1 f097e69e803 Author: Code.org Deploy Systems <dev@code.org> Date: Thu May 22 10:30:19 2025 -1000 Merge pull request #66061 from code-dot-org/staging commit f097e69e8038ac7fe674910ea27db21824c2dca0 Merge: 455ad0935f1 725ebd89e80 Author: Stephen Liang <stephenliang@users.noreply.github.com> Date: Thu May 22 13:19:10 2025 -0700 Merge pull request #66051 from code-dot-org/stephen/cache-time feat(cache): reduce revalidate period to 15 min commit 6ec0f7db9b1e4cd5f2db4add5646c892408280d1 Author: Molly Moen <molly@code.org> Date: Thu May 22 13:09:33 2025 -0700 more clean up commit 19bd86bda3cccd983a0cb1085519dba0ee059821 Author: Molly Moen <molly@code.org> Date: Thu May 22 13:08:15 2025 -0700 simplify logic commit 455ad0935f14161cefff03b5eee8412a774562ff Author: Mark Barnes <mark.barnes@code.org> Date: Thu May 22 14:45:29 2025 -0500 Create section avatar edit component (#65926) * add avatar edit dialog * fix * update styling and add all elements * PR updates * update avatar select button text commit f89dd261a90ff4c1a35a1c3b12cca67b66eb5ea9 Author: carl-codeorg <131809324+carl-codeorg@users.noreply.github.com> Date: Thu May 22 12:43:55 2025 -0700 Remove Host header from marketing site origin cache behaviors (#65818) commit 3014459f026e2cf079cf6c9204696e2f2bf88147 Merge: 77dcd0b014b b008c9ba91d Author: Molly Moen <molly@code.org> Date: Thu May 22 12:42:16 2025 -0700 Merge pull request #66027 from code-dot-org/molly/update-workspace-header Python Lab: Update workspace header height commit 77dcd0b014b8e5e81fd6dead9d68d8e138e6fdcf Author: Artem Vavilov <artem.vavilov.7@gmail.com> Date: Thu May 22 22:31:33 2025 +0300 fix(EditorialCard): a11y issue (#66049) CMS-43 commit d942a1d12d32312025b32ee7ce2f2d14b1245225 Merge: 336c208c375 dcf29dcc226 Author: Mike Harvey <43474485+mikeharv@users.noreply.github.com> Date: Thu May 22 15:28:34 2025 -0400 Merge pull request #64776 from code-dot-org/hbergam/blockly-v12 Blockly v12 Release commit 336c208c3750a38a89e35815c440f464444cecd5 Merge: 5a3011925c8 f1d99d22ffa Author: Dayne <dayne@code.org> Date: Thu May 22 12:21:57 2025 -0700 Merge pull request #66058 from code-dot-org/revert-66037-TEACH-1538/all-nested-urls-attempt-2 Revert "2nd attempt - Migrate /s/... URLs to /courses/.../units/... "nested URLs"" commit f1d99d22ffa79524087a359915937d9720baf032 Author: Dayne <dayne@code.org> Date: Thu May 22 12:21:23 2025 -0700 Revert "2nd attempt - Migrate /s/... URLs to /courses/.../units/... "nested URLs"" commit 5a3011925c8c33e6eb41c4ad5e38f8881c72357a Author: Elijah Hamovitz <elijahhamovitz@gmail.com> Date: Thu May 22 12:08:17 2025 -0700 Gzip Cached Drone Artifacts (#65936) * gzip all drone artifacts * temporarily update clone cache in this branch, so I can test without merging into actual staging * Fix yml * continue to try to figure out how drone syntax works * Revert temp changes Revert "continue to try to figure out how drone syntax works" This reverts commit ad2b2b53f37a1211deb75ec24a2f26b115f73ef1. Revert "Fix yml" This reverts commit 5295c0308531052fcfa953dd9ee2b755cefbb156. Revert "temporarily update clone cache in this branch, so I can test without merging into actual staging" This reverts commit 31250572794af219640c81ca6d123095990eea86. * temporarily revert all changes to test timing * Revert "temporarily revert all changes to test timing" This reverts commit a511c191a8829d4806fd3ea389e987a8fd915037. * resign drone.yml after updates * update drone signature after merge commit 977dd077a752f2af2744c767082106210223771f Author: Artem Vavilov <artem.vavilov.7@gmail.com> Date: Thu May 22 22:05:01 2025 +0300 CMS-722: Move Hamburger menu UI test to Header integration tests (#66026) commit 3863b3fde554f1896f3c7003ea1c7ad7ee46acf1 Merge: 57dd1a2d9e1 8ac10cbe370 Author: denyslevada <levada.denys@gmail.com> Date: Thu May 22 21:41:44 2025 +0300 Merge remote-tracking branch 'origin/staging' into denys/cms/cms-696-2 # Conflicts: # frontend/apps/marketing/src/components/contentful/actionBlocks/defaultActionBlock/ActionBlock.tsx # frontend/apps/marketing/src/components/contentful/actionBlocks/fullWidthActionBlock/FullWidthActionBlock.tsx commit 8ac10cbe370b0e44e26065bf638d63ec2739307b Author: Brendan Reville <breville@users.noreply.github.com> Date: Thu May 22 11:31:28 2025 -0700 Music: tune sharp symbol (#66040) commit 3e01badc6d915f5859277996451ee189fcb727ec Merge: eaa564b4822 bd84d2d2d66 Author: denyslevada <levada.denys@gmail.com> Date: Thu May 22 21:30:56 2025 +0300 Merge remote-tracking branch 'origin/staging' into denys/dsco/update-colors-1 commit 9eaa3c06ecbdc61d988339ab430b42bd15e0f579 Author: Kelby Hawn <9256643+kelbyhawn@users.noreply.github.com> Date: Thu May 22 11:24:25 2025 -0700 fix(marketing): allows Video and ActionBlock components to be hidden (#66045) commit 57dd1a2d9e1048e5843c581c7c1f449872947b7c Merge: 065922c37ad bd84d2d2d66 Author: denyslevada <levada.denys@gmail.com> Date: Thu May 22 21:23:18 2025 +0300 Merge remote-tracking branch 'origin/staging' into denys/cms/cms-696-2 commit bd84d2d2d66391aefd182f02856a12bba51034e4 Merge: b2f97fbbf6b 703b411c801 Author: Dayne <dayne@code.org> Date: Thu May 22 11:17:12 2025 -0700 Merge pull request #66041 from code-dot-org/TEACH-1538/temporarily-remove-permanent-redirect Temporarily disable permanent redirect for level URLs commit b1849de95273f27e94a64c47bb814661328dd621 Author: Bethany Connor <46464143+bethanyaconnor@users.noreply.github.com> Date: Thu May 22 14:16:27 2025 -0400 Update AIF homepage banner link commit b2f97fbbf6bd9da0076d8b559bb01a8bc9d99177 Merge: 52fd9bd52df 2cc9256c330 Author: wilkie <david.wilkinson@code.org> Date: Thu May 22 14:06:43 2025 -0400 Merge pull request #66035 from code-dot-org/i18n-sync-down-out-05-21-2025 I18n sync Down & Out 05/21 commit 73c82ed396cc2d763a7a17669cebee54c49b165c Author: Molly Moen <molly@code.org> Date: Thu May 22 11:01:47 2025 -0700 put theme in header commit 52fd9bd52df69b8a4eca33d3e8d4ff5bd6e22bbe Author: Brendan Reville <breville@users.noreply.github.com> Date: Thu May 22 10:53:04 2025 -0700 Music: absolute tune notes (#66025) commit f9f0b8d33c1363c0a133986c4c28d3e4d0a51057 Merge: 5331be68e7c 73a7e4e31d0 Author: Code.org Deploy Systems <dev@code.org> Date: Thu May 22 07:48:19 2025 -1000 Merge pull request #66054 from code-dot-org/staging commit 065922c37ad30b65bac41528a98a59c55028d0fb Author: denyslevada <levada.denys@gmail.com> Date: Thu May 22 20:45:34 2025 +0300 feat(actionBlocks): hide download video button commit 73a7e4e31d0955d2b0c0a6344dde08396596ceb2 Author: bencodeorg <ben@code.org> Date: Thu May 22 10:43:30 2025 -0700 Skip failing eyes test (#66053) commit 725ebd89e8053af15d3aff6424c0fd00c9abeaa2 Author: Stephen Liang <538214+stephenliang@users.noreply.github.com> Date: Thu May 22 10:37:07 2025 -0700 feat(cache): reduce revalidate period to 15 min This PR reduces the revalidate period to 15 mins for which a page is considered "fresh" to the upstream requester. The Code.org infrastructure currently has two upstream caches in a sequential chain: 1. Marketing CDN 2. Code.org front door CDN (targeted to be removed in the future) When this revalidate parameter is sent, it can take a total of [revalidate] * [number of upstream chains+1] seconds With the current value being 15 minutes, it can therefore take [900] * [2 + 1] = 45 minutes for a page to be updated. commit c96c393b3074b11e29af180fe311efed51975313 Merge: e413aff889b d75e7353be5 Author: Ryan Driscoll <ryan.driscoll@code.org> Date: Thu May 22 11:35:08 2025 -0600 Merge pull request #66013 from code-dot-org/ryan/workshops/fix/repair-custom-dropdown-layout-after-dsco-change fix(workshops): repair custom dropdown layout after dsco change commit e413aff889bf34000023675281ab30cd7338a851 Merge: df11a79c9e0 4a80d0baf36 Author: Ryan Driscoll <ryan.driscoll@code.org> Date: Thu May 22 11:34:51 2025 -0600 Merge pull request #65916 from code-dot-org/ryan/workshops/chore/clean-up-from-workshop-refactor-launch chore(workshops): clean up from workshop refactor launch commit 1d893c4c104542f637232cc7384d3223f20f44f7 Author: Stephen Liang <538214+stephenliang@users.noreply.github.com> Date: Thu May 22 08:48:07 2025 -0700 bypass error in console for favicon commit baa58538b72b4021f0380e476120be47c556be3d Author: Stephen Liang <538214+stephenliang@users.noreply.github.com> Date: Thu May 22 07:24:18 2025 -0700 Ensure 404 page has a title and update images commit efe63605c545233ba3466700f675d9ef6fd7966f Author: Stephen Liang <stephenliang@users.noreply.github.com> Date: Wed May 21 15:08:48 2025 -0700 Update frontend/apps/marketing/src/components/error/Error.tsx Co-authored-by: Kelby Hawn <9256643+kelbyhawn@users.noreply.github.com> commit 11b1f0e95bf3f987e92030f62c24d02717f8f47f Author: Stephen Liang <stephenliang@users.noreply.github.com> Date: Wed May 21 15:08:30 2025 -0700 Update frontend/apps/marketing/src/components/error/error.module.scss Co-authored-by: Kelby Hawn <9256643+kelbyhawn@users.noreply.github.com> commit 02d7e2e300d8d53025170a6c5d24994c9f456330 Author: Stephen Liang <538214+stephenliang@users.noreply.github.com> Date: Wed May 21 10:50:31 2025 -0700 feat(errors): add error boundary commit 580183b7fdffced6c5a8d6e031345a8235be8bea Author: Stephen Liang <538214+stephenliang@users.noreply.github.com> Date: Tue May 20 15:39:43 2025 -0700 feat(newrelic): add new relic browser This PR instruments the browser application with new relic's browser instrumentation. commit e68b4f7343a12806649e73f6880075f4050d1ec4 Author: Turner Riley <turner.riley@code.org> Date: Thu May 22 13:21:55 2025 -0400 clear url param after each test commit df11a79c9e07d1f6af0805608e787c1fc1e67033 Author: Continuous Integration <dev@code.org> Date: Thu May 22 17:01:16 2025 +0000 update trusted proxy list for cloudfront servers commit eaa564b4822b75f744db6de81cd917875c303575 Author: denyslevada <levada.denys@gmail.com> Date: Thu May 22 19:33:45 2025 +0300 feat(colors): update colors.scss commit d6430b1466008cee0b2133ddc3a48e3f62a56db7 Author: denyslevada <levada.denys@gmail.com> Date: Thu May 22 19:31:52 2025 +0300 feat(primitiveColors): update primitiveColors.scss commit 740c37bb8da89873a68e1ad618628264784db759 Author: Ryan Driscoll <driscollrp@gmail.com> Date: Thu May 22 09:59:42 2025 -0600 feat: add guard to query to ensure the user exists and is a teacher commit fd7da1910a045d8d2ce97baf3c10bcf7330de9eb Author: Ryan Driscoll <driscollrp@gmail.com> Date: Wed May 21 14:54:48 2025 -0600 fix: ensure local variable is set for other renderings of the school info interstitial partial commit ee53ccb8246b5d7f86536933da5ea18d742cd37d Author: Ryan Driscoll <driscollrp@gmail.com> Date: Wed May 21 09:57:39 2025 -0600 refactor: still fetch the user's existing school info so we can pre-fill their zip code and fetch the nces schools immediately commit 609edeee5bd5300ed261a50c8c29e26753814f8f Author: Ryan Driscoll <driscollrp@gmail.com> Date: Wed May 21 08:53:15 2025 -0600 refactor: remove unnecessary callback pattern and just return the promise to error can be handled commit 5176b5ee2b1ca5e761f20199b75ba06583db31ca Author: Ryan Driscoll <driscollrp@gmail.com> Date: Tue May 20 15:41:04 2025 -0600 feat: use temporary affectedByMissingSchoolData variable to conditionally handle affected users' need to update their school info commit a64327927806ffd2bebdba5c9a9fab8bb6f402fa Author: Ryan Driscoll <driscollrp@gmail.com> Date: Tue May 20 15:34:20 2025 -0600 feat: determine which users were affected by the nces school data outage and show them the school info interstitial, passing script data prop commit c36ef0cb28799213de1cf58a6e8390f6566efd98 Author: Ryan Driscoll <driscollrp@gmail.com> Date: Tue May 20 15:20:57 2025 -0600 chore: remove unused local variables commit 6ace7e10e4f640e1b88c8e1b124c35fc60961716 Author: Ryan Driscoll <driscollrp@gmail.com> Date: Tue May 20 15:17:55 2025 -0600 feat: add loading state to schools list dropdown commit 39d4a2c748aec8223b42c80623fa889a350600ad Author: Turner Riley <turner.riley@code.org> Date: Thu May 22 11:43:30 2025 -0400 pr feedback commit 7f0f87d5fc82323f52796bddd4e4eac1712487af Merge: edc51821eca aa14747f7c0 Author: Stephen Liang <stephenliang@users.noreply.github.com> Date: Thu May 22 06:39:02 2025 -0700 Merge pull request #65983 from code-dot-org/stephen/vercel-otel feat(otel): add nodejs backend otel instrumenetation commit aa14747f7c08166ecd7693a4404c6b08147344f2 Author: Stephen Liang <538214+stephenliang@users.noreply.github.com> Date: Tue May 20 15:41:35 2025 -0700 change instrumentation env var to be more generic commit 3c6381999e5bf3e59d0ec7d439ea0f3223458756 Author: Stephen Liang <538214+stephenliang@users.noreply.github.com> Date: Thu May 8 16:31:45 2025 -0700 feat(otel): add nodejs backend otel instrumenetation This PR adds the ability to collect the Next.js opentelemetry built-in instrumentation and also our own custom instrumentation and emit to an arbitrary otel collector (new relic in our case). To accomplish this, the following instrumentations were added: 1. Node.js auto instrumentation a. Pino auto instrumentation (for structured logs) 2. OTEL log exports (via pino) 3. OTEL trace exports Additionally, some custom filters were added to prevent some noisy traces which would run up our data costs on New Relic. commit edc51821eca18ea99064333d5b5f36e593049f22 Merge: d12db20861a edc7927d887 Author: Stephen Liang <stephenliang@users.noreply.github.com> Date: Thu May 22 05:31:42 2025 -0700 Merge pull request #66036 from code-dot-org/stephen/fix-content-editor-tools fix(tools): update to use dynamic path slug commit ebe08603b481645229568a71403806d027ee909d Merge: 21e5a51dc8a 49e121ddaa9 Author: Code.org Deploy Systems <dev@code.org> Date: Wed May 21 23:25:29 2025 -1000 Merge pull request #66043 from code-dot-org/dtl_candidate_0e62455c commit 49e121ddaa9c9bb3f3724bbd80a1121c18698c0f Merge: 21e5a51dc8a 0e62455ceef Author: Continuous Integration <dev@code.org> Date: Thu May 22 09:20:21 2025 +0000 Merge commit '0e62455c' into dtl_candidate_0e62455c commit d12db20861a4b571e1cafbf343096aaf413d09aa Merge: 52afe771791 5d74071af3c Author: Code.org Deploy Systems <dev@code.org> Date: Wed May 21 21:35:33 2025 -1000 Merge pull request #66042 from code-dot-org/dts_candidate_2025-05-22 DTS (Levelbuilder > Staging) [robo-dts] commit 5d74071af3c4393f7b150f1d46998d62e6373893 Merge: 52afe771791 21e5a51dc8a Author: Continuous Integration <dev@code.org> Date: Thu May 22 07:35:25 2025 +0000 Merge remote-tracking branch 'origin/levelbuilder' into dts_candidate_2025-05-22 commit 52afe77179125f73259f869bb81bbaaf64c46394 Author: Continuous Integration <dev@code.org> Date: Thu May 22 07:30:25 2025 +0000 staging content changes (-robo-commit) commit 21e5a51dc8adb479e3d1a67f30a386d71f09c220 Author: Continuous Integration <dev@code.org> Date: Thu May 22 07:30:12 2025 +0000 levelbuilder content changes (-robo-commit) commit 703b411c801d3117169420ffd1fc8b5d750e6e72 Author: Dayne <dayne@code.org> Date: Wed May 21 23:08:26 2025 -0700 Temporarily disable permanent redirect for Units URLs commit 528a516299db369d9678c1c0155c51b4d3b45efd Merge: 71e1222d821 700981905b6 Author: Dayne <dayne@code.org> Date: Wed May 21 20:38:54 2025 -0700 Merge pull request #66037 from code-dot-org/TEACH-1538/all-nested-urls-attempt-2 2nd attempt - Migrate /s/... URLs to /courses/.../units/... "nested URLs" commit 5331be68e7cf553a60b5c5ba6992de723c31dee5 Merge: 0e62455ceef 71e1222d821 Author: Code.org Deploy Systems <dev@code.org> Date: Wed May 21 16:50:18 2025 -1000 Merge pull request #66038 from code-dot-org/staging commit 71e1222d82146c0933948fd3eb3ff702cf78c8de Author: Brendan Reville <breville@users.noreply.github.com> Date: Wed May 21 18:24:24 2025 -0700 AI Tutor: initial Python Lab integration * AI Tutor: Python Lab (WIP) * Updates * Use chat component * Change model * More context * Support for user questions * Updates * Updates * Log usage * Level property to show tutor * AiTutor -> AiTutor2 * Missed files * Fix logging * Clear hint response when level changed * Updates * Handle no validations * Recreate AITutorManager on level change * AITutor2UI -> AITutor2Chat & AITutor2Response * Responsive layout for chat * useAiTutor2 Hook (#65997) * useAiTutor2 Hook * Remove AiTutor2Response * Add type * Fix text styling * Fix styling * Fix unit test * Update function name --------- Co-authored-by: Sanchit Malhotra <85528507+sanchitmalhotra126@users.noreply.github.com> commit 89cea1b49684e75253e48f3e9b90c10b32bf0b5f Merge: b1a2066daa4 c37ab29134a Author: wilkie <david.wilkinson@code.org> Date: Wed May 21 19:56:57 2025 -0400 Merge pull request #66020 from code-dot-org/i18n-sync-in-up-05-21-2025 I18n sync In & Up 05/21 commit f6c0b1a2ffac238cbb5f3e5adec52cf97625b82b Author: Molly Moen <molly@code.org> Date: Wed May 21 16:08:32 2025 -0700 make afe dialog readable commit 34075ee45d5a2bc3be8507e7c4cc50e076ed84d1 Author: Molly Moen <molly@code.org> Date: Wed May 21 15:48:35 2025 -0700 work in progress commit 700981905b6e9a1cdd40ac5a2d646373d4bbddec Author: Dayne <dayne@code.org> Date: Wed May 21 15:44:45 2025 -0700 Removed Experiment usage for 'modularity'. Use only DCDO commit 98784b9c5e000e5ddacda450c56c8d6d78988e7d Author: Dayne <dayne@code.org> Date: Wed May 21 15:47:18 2025 -0700 Revert "Revert "Migrate /s/... URLs to /courses/.../units/... "nested URLs". (#65034)" (#66033)" This reverts commit b1a2066daa42152f76cca0b3e6a667fa02b9e690. commit edc7927d887eaa31f916959f6b35fa201b3baa8e Author: Stephen Liang <stephenliang@users.noreply.github.com> Date: Wed May 21 15:47:02 2025 -0700 Update frontend/apps/marketing/src/components/contentEditorHelper/Tools/Tools.tsx commit b353f8013aaffe1272694fb9c24b9cc5caeffc4d Author: Stephen Liang <538214+stephenliang@users.noreply.github.com> Date: Wed May 21 15:30:22 2025 -0700 fix(tools): update to use dynamic path slug The page path slug was changed to be multi-directory, update the tool to join those slugs. commit 2cc9256c330371688adbf71f3b56a67a4a258b67 Author: Continuous Integration <dev@code.org> Date: Wed May 21 21:57:44 2025 +0000 hoc i18n updates commit b1ca0de13819aa09ef6b8f2724a75d3796bbdc93 Author: Continuous Integration <dev@code.org> Date: Wed May 21 21:56:54 2025 +0000 apps i18n updates commit 3b31857b1a207b7efa1789b604ecaf5415874b2b Author: Continuous Integration <dev@code.org> Date: Wed May 21 21:56:16 2025 +0000 dashboard i18n updates - Chinese Traditional commit a7a559e3eaba29a4d26e18230f94fdef843e2d70 Author: Continuous Integration <dev@code.org> Date: Wed May 21 21:55:58 2025 +0000 dashboard i18n updates - Chinese Simplified commit dde53082c6d760e2aaa0598ee5ed58068ef0cebc Author: Continuous Integration <dev@code.org> Date: Wed May 21 21:55:41 2025 +0000 dashboard i18n updates - Vietnamese commit 693e6e698c3e853ce90cc7763c1567fb1f30f69c Author: Continuous Integration <dev@code.org> Date: Wed May 21 21:55:22 2025 +0000 dashboard i18n updates - Uzbek commit bb77e5a28b4b0baf25b2153615e2adf626b1ec46 Author: Continuous Integration <dev@code.org> Date: Wed May 21 21:55:04 2025 +0000 dashboard i18n updates - Urdu (Pakistan) commit 5cc3e60c9e9b8431d9b787b81a88e274643d83bf Author: Continuous Integration <dev@code.org> Date: Wed May 21 21:54:46 2025 +0000 dashboard i18n updates - Ukrainian commit e850366aa86e4623e58acbe5512458ac1bcb33c0 Author: Continuous Integration <dev@code.org> Date: Wed May 21 21:54:28 2025 +0000 dashboard i18n updates - Turkish commit 3aba2654d6252afc19f6b26147dc8b7b78c8b771 Author: Continuous Integration <dev@code.org> Date: Wed May 21 21:54:09 2025 +0000 dashboard i18n updates - Thai commit 7ffa6095dc5a398e74ec34306740124496edea2c Author: Continuous Integration <dev@code.org> Date: Wed May 21 21:53:36 2025 +0000 dashboard i18n updates - Telugu commit 2854c2b294648ecbec66564610852607b23095ac Author: Continuous Integration <dev@code.org> Date: Wed May 21 21:53:18 2025 +0000 dashboard i18n updates - Tamil commit 051a67684d39e747b13ae5f62300b1359443de82 Author: Continuous Integration <dev@code.org> Date: Wed May 21 21:53:00 2025 +0000 dashboard i18n updates - Swedish commit d2affbee6978f5bdc5a9bafe2fbc6f76c3ac300c Author: Continuous Integration <dev@code.org> Date: Wed May 21 21:52:42 2025 +0000 dashboard i18n updates - Serbian (Cyrillic) commit e3240da89aeaf3b60e2419bf85096a1bb9233f25 Author: Continuous Integration <dev@code.org> Date: Wed May 21 21:52:24 2025 +0000 dashboard i18n updates - Albanian commit 0e62455ceeffb501b5acfec430cdc7f83329fbe2 Merge: ba1def92cdb b1a2066daa4 Author: Code.org Deploy Systems <dev@code.org> Date: Wed May 21 11:52:19 2025 -1000 Merge pull request #66034 from code-dot-org/staging commit 0bc92df9baa5e9c335e4616048819cd093feeec2 Author: Continuous Integration <dev@code.org> Date: Wed May 21 21:52:06 2025 +0000 dashboard i18n updates - Slovenian commit 2ef4f41a8c154d18f0d178c8868093d23dfb2ad1 Author: Continuous Integration <dev@code.org> Date: Wed May 21 21:51:48 2025 +0000 dashboard i18n updates - Slovak commit 046dc1fc72dda3e2d42465679dc1ead16d3e1dde Author: Continuous Integration <dev@code.org> Date: Wed May 21 21:51:30 2025 +0000 dashboard i18n updates - Sinhala commit 2afdb62d338e342d63c77e490d7dae40b298699a Author: Continuous Integration <dev@code.org> Date: Wed May 21 21:51:12 2025 +0000 dashboard i18n updates - Samoan commit ae695109468de487e60a0275e588e528ead79f52 Author: Continuous Integration <dev@code.org> Date: Wed May 21 21:50:54 2025 +0000 dashboard i18n updates - Northern Sami commit b1a2066daa42152f76cca0b3e6a667fa02b9e690 Author: Dave Bailey <davidsbailey@users.noreply.github.com> Date: Wed May 21 14:50:37 2025 -0700 Revert "Migrate /s/... URLs to /courses/.../units/... "nested URLs". (#65034)" (#66033) This reverts commit f97bbcef80c2d30dfe1b50f95d684e2b20c4ba44. commit c6bfeae2981bc29e19c0e32dc178c8f6cf5e6d40 Author: Continuous Integration <dev@code.org> Date: Wed May 21 21:50:36 2025 +0000 dashboard i18n updates - Russian commit 530b1f8023439e8be1d64459d9c5788067b7ab45 Author: Continuous Integration <dev@code.org> Date: Wed May 21 21:50:18 2025 +0000 dashboard i18n updates - Romanian commit 0c168de8e4008ed37412235e4ac71f8411bc8900 Author: Continuous Integration <dev@code.org> Date: Wed May 21 21:50:00 2025 +0000 dashboard i18n updates - Portuguese commit 8cc047737d4adc1534d99d6025b2ed02b2da900e Author: Continuous Integration <dev@code.org> Date: Wed May 21 21:49:41 2025 +0000 dashboard i18n updates - Portuguese, Brazilian commit f901c8cb64a91a596f49589309088d86799ede07 Author: Continuous Integration <dev@code.org> Date: Wed May 21 21:49:08 2025 +0000 dashboard i18n updates - Polish commit ff9f9ec065307e6c96162cc07f22be4b5e7ed942 Author: Continuous Integration <dev@code.org> Date: Wed May 21 21:48:49 2025 +0000 dashboard i18n updates - Norwegian commit df45d122745cfd3fdd92146fceba56fdb89bfe5e Author: Continuous Integration <dev@code.org> Date: Wed May 21 21:48:32 2025 +0000 dashboard i18n updates - Norwegian Nynorsk commit f2bd50f4bac91b17495a2878d30733f402313ce5 Author: Continuous Integration <dev@code.org> Date: Wed May 21 21:48:14 2025 +0000 dashboard i18n updates - Dutch commit 5f027ac8ea3f891330dbfc415a19d7536aab099d Author: Continuous Integration <dev@code.org> Date: Wed May 21 21:47:56 2025 +0000 dashboard i18n updates - Nepali commit 92194383985cb4746b3fc51ab9b4d5c42b5402a5 Author: Continuous Integration <dev@code.org> Date: Wed May 21 21:47:08 2025 +0000 dashboard i18n updates - Malay commit 3008acba75f465596addfa8c400a2fc608850fc8 Author: Continuous Integration <dev@code.org> Date: Wed May 21 21:46:49 2025 +0000 dashboard i18n updates - Marathi commit a187a494569a4d74e7b7c62b6603ef26973c5c58 Author: Continuous Integration <dev@code.org> Date: Wed May 21 21:46:31 2025 +0000 dashboard i18n updates - Mongolian commit 86eff54b4c928449a62dd33be31d19c16f574478 Author: Continuous Integration <dev@code.org> Date: Wed May 21 21:46:13 2025 +0000 dashboard i18n updates - Macedonian commit a7b7ed951a1e017954821d45822438a61c7168b3 Author: Continuous Integration <dev@code.org> Date: Wed May 21 21:45:55 2025 +0000 dashboard i18n updates - Maori commit f1f12e49997376fa305b2d61d25bb7c1b12494a9 Author: Continuous Integration <dev@code.org> Date: Wed May 21 21:45:37 2025 +0000 dashboard i18n upd…

commit 8a9fa397ad0432df1363541b5f24200c01117973 Merge: 8368715fc67 0f186957b48 Author: Ryan Driscoll <ryan.driscoll@code.org> Date: Tue May 27 10:41:54 2025 -0600 Merge pull request #66044 from code-dot-org/ryan/workshops/feat/ws-catalog-add-tooltip-for-session-dates feat: add tooltip to more sessions text in catalog commit 8368715fc67a2780960e57fc8108e08158d04075 Author: fisher-alice <107423305+fisher-alice@users.noreply.github.com> Date: Tue May 27 11:13:48 2025 -0500 [Python Lab] Move header button tooltips to bottom (#66124) [Python Lab] Move header button tooltips to bottom commit 303926946e823433a5d5f83db7d86cedfeec0d9e Merge: 1053585116a 3818696162b Author: Molly Moen <molly@code.org> Date: Tue May 27 08:40:53 2025 -0700 Merge pull request #66064 from code-dot-org/molly/theme-share-modal Theme the lab2 share modal commit 1053585116add9f61ae4e32c5b4a5f7e125a83c2 Author: Kelby Hawn <9256643+kelbyhawn@users.noreply.github.com> Date: Tue May 27 08:37:21 2025 -0700 feat(Carousel): set allowTouchMove to true by default (#66100) commit 0ad863d16e91d13a28cf32541f7a61f794821268 Author: Kelby Hawn <9256643+kelbyhawn@users.noreply.github.com> Date: Tue May 27 08:36:15 2025 -0700 Skip more pegasus ui tests on courses_eyes.feature (#66106) * skip more pegasus ui tests on courses_eyes.feature * add comments commit 72c0755bac78b68655813de01be5e9944472a0f8 Merge: 7bef9260f61 2168ff4c9a9 Author: Mike Harvey <43474485+mikeharv@users.noreply.github.com> Date: Tue May 27 11:16:08 2025 -0400 Merge pull request #66114 from code-dot-org/mike/fix-disabled [Google Blockly] set workspace.options.disabled correctly commit 7bef9260f61f6c90a9a3ed22f4a6699094a2030a Author: alex-m-brown <alex.brown@code.org> Date: Tue May 27 11:09:02 2025 -0400 Launch Modular Course URL Change (#65582) * 'modularity' - redirection from /s/ to /courses/ * Using string substitution to simplify and support more URLs * Simplify nested course URL redirection * 'bundle update rspec' to get fixes for 'and_call_original' * Using 'and_call_original' * Removing unused code * Unit tests for ScriptsController * Unit tests for LessonsController redirect * Unit tests for ScriptLevelsController redirection * Using 'Unit' instead of 'Script' * Moving queries and services to /lib * Fixing ScriptLevelsControllerTests * Using 'redirect_to_canonical_path' * Adding support for /teacher_dashboard/courses/.../units/... * Remove debugging code * Add caching for UnitGroupUnit * Using cached UnitGroupUnit methods * Using unit.unit_group_units * removed unused method * Reusing existing cached method for 'default_unit_group_units' * Removing unused 'should_cache?' method * Added documentation * Fixed documentation * Unit tests for unit_summary API * Adding isOptionSelected support for nestedUnitOverview to the TeacherNavigationBar * Unit tests for teacher_dashboard/.../courses/.../units/... * unit_position should be an integer * Addressing PR feedback * Use course_unit_path for standalone unit redirect * Refactoring Unit methods .course_link, .course_title, and .unit_group to work with Modularity * Pausing work * Fixing unit_position comparison type mismatch * Fixing URL generation for the selected section's course/unit * Fixing unit tests for expected response of section API * Single Unit course will redirect to nested URL * Updating SectionTest with new unitPosition values * Removing redundant test configurations * Adding experiments.MODULARITY to the frontend * /courses/... pages now show nested course URLs for 'Go to Unit' buttons * progress bubbles use nested URLs * lessons_controller uses nested course paths * Migrate more unit.rb paths to be nested in a course * Adding unit_group_unit everywhere * View Unit Overview button supports nested URL * Fixing broken lesson plan page * Nested URLs in activity_sections * /courses/standards supports nested URLs * BubbleChoice, Try Now, Student Lesson Plan, and Unit Overview buttons support nested URLs * My Courses on dashboard now shows the nested URLs * valid_course_offerings API returns nested URLs * Add Jira to peer_review TODO * Rename 'script' to 'unit' * Adding TODO TEACH-1864 * Adding TODO TEACH-1865 * Adding TODO TEACH-1866 * Adding TODO TEACH-1864 * Fixing progress API call when the modularity experiement is off * Script Overview page will redirect to /s/ if the modularity experience is off * Fixing test/unit/code-studio/components/progress/UnitOverviewTopRowTest.jsx * Fixing tests to supply a path to CourseScript * Forward 'modularity' DCDO value to front-end * Fixing some UI tests * Fixing DCDO * Using keyword parameters for unit_group_unit and fixing section_text_responses API * Fixed 'params' keyword parameter usage * acquisition products tests * code tools tests * foundations tests * javalab tests * platform tests * star labs tests * step definitions tests * student learning tests * teacher tools tests * xteam and misc. tests * Added error handling for Queries::Courses.get_course_context * update steps to use new url structure * Fixing unit_group_unit.unit_group usage * match on /teacher_dashboard not teacher_dashboard * Using origin_unit_group rather than the 'first' one * Fixing a lot of unit tests, mostly related to caching * Adding nil checks * Fixing unit tests * add navigating within modular course test * Fixed number of db queries * Adding missing section_id query param * turn on modularity dcdo * fix unit tests * fix ui tests * fix more tests [test all] * fix eyes tests [test all] * Fixing 'modularity' DCDO value being passed to front-end * Changing param name to unit_name_or_id * Update route docs in lessons_controller * .unit_group_unit falls back to orignal_unit_group * Look for the next unit in the same unit group * Adding .get_unit_context tests * Testing unit_id passed to .get_course_context * Added cache test for .get_unit_context * Add error handling for 'nil' .get_unit_context * The 'Continue' button now links to a nested URL * Using nested URL for Unit link in MiddleHeader * lesson_extras_level_url in MiddleHeader uses nested URL * fix unit test * use script_next_path * Use nested unit path in TeacherNavigationBar if modularity is enabled * Adding canonical_url helper function * Revert "Adding canonical_url helper function" This reverts commit 316f660210587a9ad0324823b102acdd19b42240. * Adding nested redirect for scripts_controller :vocab, :resources, :code, :standards * scripts_controller can now redirect to nested urls in teacher_dashboard * SelfPacedProgressTable now uses nested URLs * fix ui test * Adding unitPosition to test data * Using a shared library to look up course context in script_levels_controller * Add handling for fake Units created by get_unit_family_redirect_for_user * fix unit test [test all] * Passing unit_name_or_id explicitly to canonical_path * remove todos * Delete dashboard/test/ui/features/platform/hamburger.feature * Update cookie_banner.feature * fix cookie banner eyes test [test all] --------- Co-authored-by: Dayne <dayne@code.org> commit 949f4f6911a3ff7e6708a1846a9b2bc433177946 Author: Sanchit Malhotra <85528507+sanchitmalhotra126@users.noreply.github.com> Date: Tue May 27 11:04:59 2025 -0400 Fix assessment level progress update in Lab2 (#66101) commit 0f186957b4825cde2e95f39372bad6b5817ab522 Author: Ryan Driscoll <driscollrp@gmail.com> Date: Thu May 22 12:44:56 2025 -0600 feat: add tooltip to session date detail row commit aedc6b500fe0aaf03f8011d69ef14bd56ecf2b84 Author: Mark Barnes <mark.barnes@code.org> Date: Tue May 27 09:17:27 2025 -0500 Section avatar editor backend and tests (#65979) * add avatar edit dialog * fix * update styling and add all elements * select and save working * PR updates * update avatar select button text * unit test and accessibility updates * accessibility updates * accessibility updates * unit test updates * accessibility updates and bug fixes * bug fix * remove unnecessary id * PR updates * dedupe * bug fixes * bug fixes * bug fix * test fix commit 2c2a01ee17954e8406d61f74602a27211d921c75 Merge: 454212b76a0 59822653d3f Author: Stephen Liang <stephenliang@users.noreply.github.com> Date: Tue May 27 06:47:02 2025 -0700 Merge pull request #66113 from code-dot-org/stephen/turbo-cache fix(turbo): prevent turbocache from infinitely growing commit 454212b76a084a9851479d4e533ac197344fa1dc Merge: 9dd1a430c6f 2f120bc13fd Author: Code.org Deploy Systems <dev@code.org> Date: Mon May 26 21:35:26 2025 -1000 Merge pull request #66122 from code-dot-org/dts_candidate_2025-05-27 DTS (Levelbuilder > Staging) [robo-dts] commit 2f120bc13fdb5935ea9364870d97cc69a52f779e Merge: 9dd1a430c6f 80fa62fbb74 Author: Continuous Integration <dev@code.org> Date: Tue May 27 07:35:19 2025 +0000 Merge remote-tracking branch 'origin/levelbuilder' into dts_candidate_2025-05-27 commit 9dd1a430c6f87e5792e25919270695a97a5b386c Author: Continuous Integration <dev@code.org> Date: Tue May 27 07:30:27 2025 +0000 staging content changes (-robo-commit) commit 80fa62fbb74ed126686a8c288d14bfda38423907 Author: Continuous Integration <dev@code.org> Date: Tue May 27 07:30:12 2025 +0000 levelbuilder content changes (-robo-commit) commit 4c812db2f79b6186518feb04f582c67f1ff54075 Merge: 18c3c0b4f6b 4f6c422a452 Author: Code.org Deploy Systems <dev@code.org> Date: Sun May 25 23:25:42 2025 -1000 Merge pull request #66118 from code-dot-org/dtl_candidate_105dc2fb commit 4f6c422a452f0ae0aebc64acaf2ab0b8d69bd7d1 Merge: 18c3c0b4f6b 105dc2fbfd6 Author: Continuous Integration <dev@code.org> Date: Mon May 26 09:20:22 2025 +0000 Merge commit '105dc2fb' into dtl_candidate_105dc2fb commit f3105a5575258ead93f2059a61ab49ce37e6bbda Merge: 31427f70a14 6b2c2d45300 Author: Code.org Deploy Systems <dev@code.org> Date: Sun May 25 21:42:00 2025 -1000 Merge pull request #66116 from code-dot-org/dts_candidate_2025-05-26 DTS (Levelbuilder > Staging) [robo-dts] commit 6b2c2d45300e824ece6d7ff55f7e06365d7e5cb6 Merge: 31427f70a14 18c3c0b4f6b Author: Continuous Integration <dev@code.org> Date: Mon May 26 07:41:53 2025 +0000 Merge remote-tracking branch 'origin/levelbuilder' into dts_candidate_2025-05-26 commit 31427f70a14c59804681038e2884c6d87736ccb5 Author: Continuous Integration <dev@code.org> Date: Mon May 26 07:30:26 2025 +0000 staging content changes (-robo-commit) commit 18c3c0b4f6bd0f017570dfb2f376a0602a79993d Author: Continuous Integration <dev@code.org> Date: Mon May 26 07:30:12 2025 +0000 levelbuilder content changes (-robo-commit) commit bf20eb432b738ad717e0fab3af344ac766481e88 Merge: ae11542de5a 6bce6d43717 Author: Dayne <dayne@code.org> Date: Fri May 23 17:57:55 2025 -0700 Merge pull request #66107 from code-dot-org/TEACH-1915/fix-unit-numbering Fixing modular Unit numbering on CourseOverview page commit 2168ff4c9a964fe21cd9c9c29dd478941f82334f Author: Mike Harvey <mike.harvey@code.org> Date: Fri May 23 20:16:04 2025 -0400 set workspace.options.disabled correctly commit 59822653d3f419812b7805cee34ff6765978da12 Author: Stephen Liang <538214+stephenliang@users.noreply.github.com> Date: Fri May 23 16:51:42 2025 -0700 fix(turbo): prevent turbocache from infinitely growing commit 166a943845e62d75370e6ffb181d4d73b0c9f8ff Merge: 83a1ea6f3de ecdcdc3aa2c Author: carl-codeorg <131809324+carl-codeorg@users.noreply.github.com> Date: Fri May 23 16:24:38 2025 -0700 Merge pull request #66110 from code-dot-org/dtl_candidate_3241cba6 DTL (Test > Levelbuilder: 3241cba6) commit ecdcdc3aa2c8da9178bf79125c670ea206b16523 Merge: 3241cba6dfd 83a1ea6f3de Author: carl-codeorg <131809324+carl-codeorg@users.noreply.github.com> Date: Fri May 23 16:22:56 2025 -0700 Merge branch 'levelbuilder' into dtl_candidate_3241cba6 commit ae11542de5aad7fc2f7f228006ecf3c7a00fb5af Merge: 4d6a35ef902 ba65447739f Author: Turner Riley <56283563+TurnerRiley@users.noreply.github.com> Date: Fri May 23 18:19:26 2025 -0400 Merge pull request #66105 from code-dot-org/add-time-to-flaky-regional-workshop-test Give flaky Regional Workshop Catalog frontend test more time to complete commit 6bce6d43717171dba30d0bd74208637ba72c216f Author: Dayne <dayne@code.org> Date: Fri May 23 15:16:55 2025 -0700 Fixing module Unit numbering on CourseOverview page commit ba65447739f68c6b722e8490fd461fc3c0a76f30 Author: Turner Riley <turner.riley@code.org> Date: Fri May 23 18:06:09 2025 -0400 add time to flaky regional workshop test commit 4d6a35ef90251ad39e626fd5d8fdc00d87b3238c Author: Brendan Reville <breville@users.noreply.github.com> Date: Fri May 23 15:05:46 2025 -0700 AI Tutor: Python Lab URL parameter (#66075) * AI Tutor: Python Lab URL parameter * Check before running an ask on run/validate commit d3ab6841750b4ce3bac240babc689635987f9ed3 Merge: b163d9821de 286514e7dab Author: Stephen Liang <stephenliang@users.noreply.github.com> Date: Fri May 23 15:03:00 2025 -0700 Merge pull request #66092 from code-dot-org/add-farsi-redirects Add farsi redirects commit b163d9821de69473dd592eb24ec0c6c8e77c9338 Merge: 15b974ae981 483c51cf37c Author: Molly Moen <molly@code.org> Date: Fri May 23 14:45:04 2025 -0700 Merge pull request #66068 from code-dot-org/molly/misc-python-theming Small python lab theming updates commit 105dc2fbfd6ba27b2e43882dea4c1903aa9c0a0c Merge: 3241cba6dfd 15b974ae981 Author: Code.org Deploy Systems <dev@code.org> Date: Fri May 23 11:20:18 2025 -1000 Merge pull request #66103 from code-dot-org/staging commit 15b974ae981fa8d057888198e8644ff3dff15acd Author: Eric Aderhold <eric.aderhold@code.org> Date: Fri May 23 14:19:06 2025 -0700 Add AI FAB to level pages, refactor chat API (#65860) * Add AI FAB to level pages, refactor chat API * Fix AiDiffChatTest * Don't show FAB when tutor is shown commit a62063276e2dc1859854a80dd25753acb2fe2c32 Merge: a7039d09106 b5c4913a5e0 Author: Turner Riley <56283563+TurnerRiley@users.noreply.github.com> Date: Fri May 23 17:14:25 2025 -0400 Merge pull request #66063 from code-dot-org/split-national-regional-workshops-on-catalog Split National/Regional workshop sections and add zip error message commit a7039d09106f888de2cca887dd7cf4d8175c211c Merge: beda94f2ad3 d73e474331d Author: Turner Riley <56283563+TurnerRiley@users.noreply.github.com> Date: Fri May 23 16:49:28 2025 -0400 Merge pull request #66028 from code-dot-org/regional-workshop-catalog-bug-bash-fixes Quick Regional Workshop Catalog bug bash feedback fixes commit beda94f2ad3b9ac8d8e0c576f36fb7002b2df8f5 Author: Sanchit Malhotra <85528507+sanchitmalhotra126@users.noreply.github.com> Date: Fri May 23 13:47:13 2025 -0700 AI Chat: fix starter assets upload dialog overlap (#65862) * AI Chat: fix starter assets upload dialog overlap * Include script levels controller fix commit 3818696162b0b3b6ad4b895b8c9db5b55a5e64de Author: Molly Moen <molly@code.org> Date: Fri May 23 13:34:50 2025 -0700 clean up commit 51234266e4f1851189be6cb6fa00a1dda051ba8a Author: Molly Moen <molly@code.org> Date: Fri May 23 13:30:45 2025 -0700 move data to lab2registry commit 483c51cf37c95509426a42c2b09f506994c530fb Author: Molly Moen <molly@code.org> Date: Fri May 23 13:14:06 2025 -0700 fix unit test commit 11552efd62a3f6675cc500cac0705f806b7f673a Author: Kaitie O <kaitie@code.org> Date: Fri May 23 15:06:29 2025 -0500 Re-enable Safari test (#65912) * Remove reference to teacher tool bar in test * added a test for on the unit page * add cookie * fix safari issue * fix safari issue commit e913a5aedae137d2c82175b6ebe64c5fb7af5747 Merge: 4b93f169045 740c37bb8da Author: Ryan Driscoll <ryan.driscoll@code.org> Date: Fri May 23 13:54:05 2025 -0600 Merge pull request #65993 from code-dot-org/ryan/school-association/fix/clear-bad-school-info fix(school association): prompt affected users to re-submit school info commit 3241cba6dfd0670abbcc36bf8c428fae0e7eab0f Merge: 568dbb7822e 4b93f169045 Author: Code.org Deploy Systems <dev@code.org> Date: Fri May 23 09:12:18 2025 -1000 Merge pull request #66098 from code-dot-org/staging commit b5c4913a5e0e0a1c0b7d146b27dcdaa816c61acb Merge: 2cb9246c55c d73e474331d Author: Turner Riley <turner.riley@code.org> Date: Fri May 23 14:47:35 2025 -0400 merge in staging commit d73e474331dc7e316886067322ab2b5a56d30a2a Author: Turner Riley <turner.riley@code.org> Date: Fri May 23 14:42:21 2025 -0400 move into function commit 2cb9246c55c2585f83fcce8afa4637ed580bf21a Author: Turner Riley <turner.riley@code.org> Date: Fri May 23 14:40:28 2025 -0400 move logic into function commit b85d85ad0dbd1f91527045fcc21cbc029ebb21b1 Merge: 9d1ff7230c1 242ac3063a7 Author: Turner Riley <turner.riley@code.org> Date: Fri May 23 14:18:54 2025 -0400 Merge branch 'regional-workshop-catalog-bug-bash-fixes' into split-national-regional-workshops-on-catalog commit 242ac3063a766ff0ded06f3084450713fcdd6548 Author: Turner Riley <turner.riley@code.org> Date: Fri May 23 14:16:57 2025 -0400 fix private method bug commit 4b93f169045dfdd880a616434d7f158ea2996657 Merge: 9be317d2485 059f936edb8 Author: Mike Harvey <43474485+mikeharv@users.noreply.github.com> Date: Fri May 23 14:13:43 2025 -0400 Merge pull request #66091 from code-dot-org/mike/trashcan-weight [Google Blockly] Fix trashcan weight commit 9d1ff7230c1bae7b946d9145ec1cccdd2a9e56ab Author: Turner Riley <turner.riley@code.org> Date: Fri May 23 14:08:58 2025 -0400 match timing behavior commit 73b0bfddd53867c288c32348e49c4f01df8c09e4 Merge: 97a8823a149 95a25c48206 Author: Turner Riley <56283563+TurnerRiley@users.noreply.github.com> Date: Fri May 23 14:07:08 2025 -0400 Merge branch 'regional-workshop-catalog-bug-bash-fixes' into split-national-regional-workshops-on-catalog commit 95a25c48206684e8e0a23f2fe53b4aeb65a8ea4d Author: Turner Riley <turner.riley@code.org> Date: Fri May 23 13:54:47 2025 -0400 convert start to workshop time zone or dont default to chicago commit 9be317d24859edb1094bd5d4d45c80366f1b52a1 Author: carl-codeorg <131809324+carl-codeorg@users.noreply.github.com> Date: Fri May 23 10:52:42 2025 -0700 skip gdpr test (#66094) commit 58047114b898a65936093c875db675ec70a7e9d8 Merge: e0993dca27b 59f598367c7 Author: Mike Harvey <43474485+mikeharv@users.noreply.github.com> Date: Fri May 23 13:47:07 2025 -0400 Merge pull request #66079 from code-dot-org/mike/select-event-early-return [Music] Early return for block selected events commit e0993dca27b05ed77c9617194f793d4e1a5fd18f Author: Kelby Hawn <9256643+kelbyhawn@users.noreply.github.com> Date: Fri May 23 10:41:35 2025 -0700 Remove or skip more Pegasus ui tests (#66090) * remove or skip pegasus ui tests * put homepage tests back commit 02ad86f4b6bf4129e6a0ac643818c3865723fd7a Merge: d085cbfeaa5 8be02aac788 Author: Turner Riley <turner.riley@code.org> Date: Fri May 23 13:31:15 2025 -0400 Merge branch 'staging' into regional-workshop-catalog-bug-bash-fixes commit 8be02aac7889a251ac3a5bdd734fd62b680376a4 Author: Artem Vavilov <artem.vavilov.7@gmail.com> Date: Fri May 23 20:14:16 2025 +0300 CMS-722: Fix flaky HeaderTest (#66088) commit 035bafb007d04adfd56e6de1bade04d0c9327ca8 Merge: 937824830e4 5a27e0568e6 Author: Mike Harvey <43474485+mikeharv@users.noreply.github.com> Date: Fri May 23 12:30:30 2025 -0400 Merge pull request #66080 from code-dot-org/mike/focus-outline [Google Blockly] No path outline for focused blocks commit 286514e7dabf308eb925a8da4d27fa33586a836d Author: Dani <dani@code.org> Date: Fri May 23 12:25:14 2025 -0400 Add farsi redirects commit 937824830e4a5629b6956dabb7a0ccd36a11608e Author: Cassi Brenci <cassi.brenci@code.org> Date: Fri May 23 09:17:59 2025 -0700 Lab2: Change white-space handling for instructions panel (#65834) commit 49f4495b1b0cfbca9e51bca31f794838bbae7387 Merge: 06d31f4e5c8 a8e9d0ef590 Author: Stephen Liang <stephenliang@users.noreply.github.com> Date: Fri May 23 09:04:07 2025 -0700 Merge pull request #66000 from code-dot-org/stephen/newrelic feat(newrelic): add new relic browser commit 059f936edb8e4bd1ca352c70c78e1b78ead687ef Author: Mike Harvey <mike.harvey@code.org> Date: Fri May 23 11:55:25 2025 -0400 [Google Blockly] Fix trashcan weight commit 06d31f4e5c8f1872152f73e03d2e33c20c5b257d Merge: d32fa09f28e ae61222fa23 Author: Dayne <dayne@code.org> Date: Fri May 23 08:32:23 2025 -0700 Merge pull request #66062 from code-dot-org/TEACH-1538/all-nested-urls-attempt-3 3rd attempt - Migrate /s/... URLs to /courses/.../units/... "nested URLs" commit 568dbb7822e1262f607937816337acbdd4755dfc Merge: 2fd09ffd975 d32fa09f28e Author: Code.org Deploy Systems <dev@code.org> Date: Fri May 23 05:26:18 2025 -1000 Merge pull request #66089 from code-dot-org/staging commit d32fa09f28e6e24312284ce4528a8f626c43a7ff Author: Kelby Hawn <9256643+kelbyhawn@users.noreply.github.com> Date: Fri May 23 08:24:12 2025 -0700 Update menu icons on Headers (#66030) * remove minus icon from ProjectsMenu.tsx * update expandable menus to use chevrons commit 223e13002c1091abcc8c516307b193b56eac9dc3 Author: Kelby Hawn <9256643+kelbyhawn@users.noreply.github.com> Date: Fri May 23 08:21:34 2025 -0700 feat(HeroBanner): add hideImageOnSmallScreen prop (#66055) * feat(HeroBanner): add hideImageOnSmallScreen prop * add to Contentful * clean up commit 404bd5fa7664b6dd133281c9ce4767bd13559ab2 Merge: e3afb0138f0 7ec0bee1673 Author: Stephen Liang <stephenliang@users.noreply.github.com> Date: Fri May 23 08:20:14 2025 -0700 Merge pull request #66086 from code-dot-org/stephen/fix-cache-time fix(cache): update cache time in view response function commit a8e9d0ef5906fc77f339c69f5b6608fd8c8cc776 Author: Stephen Liang <538214+stephenliang@users.noreply.github.com> Date: Fri May 23 08:17:57 2025 -0700 fix env var on marketing stack commit e3afb0138f02aa56dc97dd12851fd175b29e8830 Merge: b3567603f7a 0fdef8a2e1f Author: Stephen Liang <stephenliang@users.noreply.github.com> Date: Fri May 23 08:10:31 2025 -0700 Merge pull request #66084 from code-dot-org/dmcavoy-patch-3 Update next.config.ts commit b3567603f7adec2b29ecafa9d2594ba2cec30aca Merge: df526552848 b1849de9527 Author: Bethany Connor <46464143+bethanyaconnor@users.noreply.github.com> Date: Fri May 23 10:26:38 2025 -0400 Merge pull request #66056 from code-dot-org/bethany/update-aif-homepage-banner-link Update AIF homepage banner link commit 59f598367c78fd4771a6d5eba645fc97dd1ae9ab Merge: 0543fe28772 df526552848 Author: Mike Harvey <mike.harvey@code.org> Date: Fri May 23 10:02:53 2025 -0400 Merge branch 'staging' into mike/select-event-early-return commit 5a27e0568e6510d09dfd8403c3409d57e0458a03 Merge: 56a9385dd23 df526552848 Author: Mike Harvey <mike.harvey@code.org> Date: Fri May 23 10:02:37 2025 -0400 Merge branch 'staging' into mike/focus-outline commit df526552848471651f2abec573e7e2944f2966c3 Merge: 4c871c11ecd 96664e92604 Author: Mike Harvey <43474485+mikeharv@users.noreply.github.com> Date: Fri May 23 10:02:10 2025 -0400 Merge pull request #66087 from code-dot-org/mike/editor_type remove editor_type from programming environment files commit 96664e926049dd6f90583d250b1546f261c7604a Author: Mike Harvey <mike.harvey@code.org> Date: Fri May 23 09:55:36 2025 -0400 remove editor_type from programming environment files commit 7ec0bee167319c3f386bb766c2b883aaf76e8495 Author: Stephen Liang <538214+stephenliang@users.noreply.github.com> Date: Fri May 23 06:52:42 2025 -0700 fix(cache): update cache time in view response function commit 0fdef8a2e1f1caaaeaa8fe6630de10e5e87ee5ea Author: Dani LaMarca <dani@code.org> Date: Fri May 23 09:14:44 2025 -0400 Update next.config.ts commit 2fd09ffd975209a89c047bd22f57e403f2747c8c Merge: dd2e4763598 4c871c11ecd Author: Code.org Deploy Systems <dev@code.org> Date: Fri May 23 02:54:19 2025 -1000 Merge pull request #66082 from code-dot-org/staging commit 56a9385dd23a77f1696da282018ca2e8d9b11fe3 Author: Mike Harvey <mike.harvey@code.org> Date: Fri May 23 08:40:11 2025 -0400 [Google Blockly] No path outline for focused blocks commit 0543fe287727970b84e48348e9e2a3155ca4bb0b Author: Mike Harvey <mike.harvey@code.org> Date: Fri May 23 08:09:28 2025 -0400 [Music] Early return for block selected events commit 83a1ea6f3def356e793acd00cb2f7d2bda835ead Merge: 211e263395b 86780a894df Author: Code.org Deploy Systems <dev@code.org> Date: Thu May 22 23:25:36 2025 -1000 Merge pull request #66077 from code-dot-org/dtl_candidate_b37fdce6 commit 86780a894dfbec1cb929e3b05346843c1fac62eb Merge: 211e263395b b37fdce6889 Author: Continuous Integration <dev@code.org> Date: Fri May 23 09:20:25 2025 +0000 Merge commit 'b37fdce6' into dtl_candidate_b37fdce6 commit 4c871c11ecd8bc7eae40f37c1156475ee1519050 Merge: 7ee1804f06c 6f5cf98b3eb Author: Code.org Deploy Systems <dev@code.org> Date: Thu May 22 21:35:36 2025 -1000 Merge pull request #66076 from code-dot-org/dts_candidate_2025-05-23 DTS (Levelbuilder > Staging) [robo-dts] commit 6f5cf98b3ebb875d85e010dca32dc505fb139427 Merge: 7ee1804f06c 211e263395b Author: Continuous Integration <dev@code.org> Date: Fri May 23 07:35:27 2025 +0000 Merge remote-tracking branch 'origin/levelbuilder' into dts_candidate_2025-05-23 commit 7ee1804f06c72b5efac78957b38212168c26522f Author: Continuous Integration <dev@code.org> Date: Fri May 23 07:30:25 2025 +0000 staging content changes (-robo-commit) commit 211e263395b75e055b2cc8a353859fb3b7cfa96b Author: Continuous Integration <dev@code.org> Date: Fri May 23 07:30:12 2025 +0000 levelbuilder content changes (-robo-commit) commit ae61222fa23339e15945ebe2c6a019199518f6e7 Author: Dayne <dayne@code.org> Date: Thu May 22 23:46:39 2025 -0700 Add UnitGroupUnit#cached_unit_group and use it in Unit.summarize commit 48698ebdcef47e6fe3e3298b393d23b7e3541008 Merge: ecd48b17576 3863b3fde55 Author: levadadenys <levada.denys@gmail.com> Date: Fri May 23 08:59:03 2025 +0300 Merge pull request #66007 from code-dot-org/denys/cms/cms-696-2 [CMS-696] Create definitions to make action blocks work with videos commit ecd48b175769414cc29aedc12b15cb638df2a59a Merge: 84cca67c560 3e01badc6d9 Author: levadadenys <levada.denys@gmail.com> Date: Fri May 23 08:58:33 2025 +0300 Merge pull request #66047 from code-dot-org/denys/dsco/update-colors-1 DSCO Update colors commit 84cca67c560cb7f9e0c7cb979203808cdfc29cd0 Author: Hannah Bergam <hannahbergam@gmail.com> Date: Thu May 22 21:18:38 2025 -0700 Making WithTooltip update position dynamically (#65142) * progress toward dynamic overflow * so so much closer * feat(tooltip): implement direction flip when tooltip is positioned outside of screen * feat(tooltip): simplify tooltip position recalculation calls logic * feat(common): add 'none direction' to ComponentPlacementDirection * feat(tooltip): add 'none' direction option for tooltips * restore ensure tooltip stays within the viewport logic * feat(popover): ensure proper direction handling * minor update of NoneDirectionTooltip story position and description * lint fixes * fix failing drone * Fix(Tooltip): Add hideTail prop (#66052) * add noTail prop * change prop name, add story * remove !important, add story and unit tests * add comment for new prop --------- Co-authored-by: denyslevada <levada.denys@gmail.com> Co-authored-by: fisher-alice <107423305+fisher-alice@users.noreply.github.com> commit 318f380f80c02cbc7d07243cab4e1209ea20340f Merge: 2b2d919df9f c6df3831fdd Author: Stephen Liang <stephenliang@users.noreply.github.com> Date: Thu May 22 18:55:45 2025 -0700 Merge pull request #66074 from code-dot-org/dmcavoy-patch-2 Update next.config.ts commit 595fa6e2e3da9390de492a59e11adccf4b89cbfb Author: Dayne <dayne@code.org> Date: Thu May 22 18:12:58 2025 -0700 Fixing 'Go to Unit' links on CourseOverview page in teacher dashboard commit bd8e75d318d93ba9b241d8c10969f23188cde08a Author: Dayne <dayne@code.org> Date: Thu May 22 17:42:04 2025 -0700 Adding nested URL stupport for section select commit c6df3831fddde7bbb16ede4b48eaa8fcdb607deb Author: Dani LaMarca <dani@code.org> Date: Thu May 22 21:00:51 2025 -0400 Update next.config.ts commit 2b2d919df9f2bd511723a9f69ec9010f1503be31 Author: Artem Vavilov <artem.vavilov.7@gmail.com> Date: Fri May 23 03:42:58 2025 +0300 feat(marketing): add editorial cards to /all-the-things (#66016) CMS-593 commit 186ddcfae6cde3e5ec60e5edd27f98ea2fae73f7 Author: Brendan Reville <breville@users.noreply.github.com> Date: Thu May 22 17:13:29 2025 -0700 Music: enable play tune (#65972) * Music: tune enable * Add play tune to end of /s/music-jam-2024 * Report analytic on block usage * Loc button text & add analytic event * Update analytics event commit fd5b71539b169d2ec2207228c6c7528538cc699f Merge: 149c9b5f70e 8dca051fed6 Author: Mike Harvey <43474485+mikeharv@users.noreply.github.com> Date: Thu May 22 19:53:14 2025 -0400 Merge pull request #66070 from code-dot-org/sanchit/music-blockly-select Music: use addSelect/removeSelect to avoid recursion commit 97a8823a1490cfcb68f700a4e929b529d3181901 Author: Turner Riley <turner.riley@code.org> Date: Thu May 22 19:46:38 2025 -0400 fix time test commit dd2e4763598cfa69319196ef20002b5b886aea3e Merge: b37fdce6889 149c9b5f70e Author: Code.org Deploy Systems <dev@code.org> Date: Thu May 22 13:46:18 2025 -1000 Merge pull request #66071 from code-dot-org/staging commit 4edfb2899bdefc9280b1effe4498f461e13b2f8b Merge: ef6a80028cb d085cbfeaa5 Author: Turner Riley <turner.riley@code.org> Date: Thu May 22 19:45:25 2025 -0400 fix merge conflict commit 8dca051fed694eb151f3768f37dbfa19dc90eb30 Author: Sanchit Malhotra <sanchit@code.org> Date: Thu May 22 16:43:27 2025 -0700 Music: use addSelect/removeSelect to avoid recursion commit d085cbfeaa514798d0ce85cd2f770faec5ed698d Merge: cb1fa418b9e 149c9b5f70e Author: Turner Riley <turner.riley@code.org> Date: Thu May 22 19:28:22 2025 -0400 merge in staging commit cb1fa418b9e995f9b63a27d8cf5e06ef5d5f2016 Author: Turner Riley <turner.riley@code.org> Date: Thu May 22 19:27:10 2025 -0400 fix merge conflict commit 149c9b5f70ec89db9cd6bee53004a742b0b52ca7 Author: Kelby Hawn <9256643+kelbyhawn@users.noreply.github.com> Date: Thu May 22 15:39:38 2025 -0700 chore(marketing): update Tools heading in CurriculumSnapshot (#66059) * chore(marketing): update Tools heading in CurriculumSnapshot * fix failing test commit 861a019283bd85783166de63ee8a0b7ff2761be5 Author: Turner Riley <turner.riley@code.org> Date: Thu May 22 17:44:36 2025 -0400 adjust to timezone commit ef6a80028cb924277c84187fb83abc23e4344c6e Author: Turner Riley <turner.riley@code.org> Date: Thu May 22 17:32:11 2025 -0400 update frontend tests commit be474aa7b74564ce2cb0bec5ba05f49221160465 Author: Molly Moen <molly@code.org> Date: Thu May 22 14:21:39 2025 -0700 purple buttons in modal commit 04440443a9978485472149d08da631e8eb5885c7 Author: Dayne <dayne@code.org> Date: Thu May 22 13:36:51 2025 -0700 Query directly for the User rather than looping through all script_levels and querying each user commit c6d10e8a37f0747ec5a1e1ce93f8730309f7393a Author: Molly Moen <molly@code.org> Date: Thu May 22 14:19:03 2025 -0700 update picker to theme correctly commit b7a7c0f073255bc511d6567edc5f5d560de237b8 Author: Molly Moen <molly@code.org> Date: Thu May 22 14:10:46 2025 -0700 fix validate button color commit c1aec0966bf67e293f3937840d26fdc5ed1609ba Author: Molly Moen <molly@code.org> Date: Thu May 22 13:56:04 2025 -0700 undo changes to ProjectShare commit 3d7093e7fbdd2e6168ee27307ad27d2c39bf73de Author: Molly Moen <molly@code.org> Date: Thu May 22 13:52:22 2025 -0700 clean up and add comment commit 65f74c6d93909a5f811daf0d512a6e5c62319b3b Author: Dani LaMarca <dani@code.org> Date: Thu May 22 16:46:53 2025 -0400 Update next.config.ts (#66060) commit fe655d8579e98c36ebc4b5d519db576ed0f63344 Author: Turner Riley <turner.riley@code.org> Date: Thu May 22 16:43:43 2025 -0400 undo accidental change to course offerings controller commit b8c95e88ea5ddfa8c63e2f282c3137e1b373f717 Author: Turner Riley <turner.riley@code.org> Date: Thu May 22 16:43:13 2025 -0400 split sections commit 5648f7f37d02398485dea0794589e488afd6582b Author: Dayne <dayne@code.org> Date: Thu May 22 13:33:39 2025 -0700 Revert "Revert "2nd attempt - Migrate /s/... URLs to /courses/.../units/... "nested URLs""" This reverts commit f1d99d22ffa79524087a359915937d9720baf032. commit b37fdce68897eaab1ad06e49f967ae575f822949 Merge: f9f0b8d33c1 f097e69e803 Author: Code.org Deploy Systems <dev@code.org> Date: Thu May 22 10:30:19 2025 -1000 Merge pull request #66061 from code-dot-org/staging commit f097e69e8038ac7fe674910ea27db21824c2dca0 Merge: 455ad0935f1 725ebd89e80 Author: Stephen Liang <stephenliang@users.noreply.github.com> Date: Thu May 22 13:19:10 2025 -0700 Merge pull request #66051 from code-dot-org/stephen/cache-time feat(cache): reduce revalidate period to 15 min commit 6ec0f7db9b1e4cd5f2db4add5646c892408280d1 Author: Molly Moen <molly@code.org> Date: Thu May 22 13:09:33 2025 -0700 more clean up commit 19bd86bda3cccd983a0cb1085519dba0ee059821 Author: Molly Moen <molly@code.org> Date: Thu May 22 13:08:15 2025 -0700 simplify logic commit 455ad0935f14161cefff03b5eee8412a774562ff Author: Mark Barnes <mark.barnes@code.org> Date: Thu May 22 14:45:29 2025 -0500 Create section avatar edit component (#65926) * add avatar edit dialog * fix * update styling and add all elements * PR updates * update avatar select button text commit f89dd261a90ff4c1a35a1c3b12cca67b66eb5ea9 Author: carl-codeorg <131809324+carl-codeorg@users.noreply.github.com> Date: Thu May 22 12:43:55 2025 -0700 Remove Host header from marketing site origin cache behaviors (#65818) commit 3014459f026e2cf079cf6c9204696e2f2bf88147 Merge: 77dcd0b014b b008c9ba91d Author: Molly Moen <molly@code.org> Date: Thu May 22 12:42:16 2025 -0700 Merge pull request #66027 from code-dot-org/molly/update-workspace-header Python Lab: Update workspace header height commit 77dcd0b014b8e5e81fd6dead9d68d8e138e6fdcf Author: Artem Vavilov <artem.vavilov.7@gmail.com> Date: Thu May 22 22:31:33 2025 +0300 fix(EditorialCard): a11y issue (#66049) CMS-43 commit d942a1d12d32312025b32ee7ce2f2d14b1245225 Merge: 336c208c375 dcf29dcc226 Author: Mike Harvey <43474485+mikeharv@users.noreply.github.com> Date: Thu May 22 15:28:34 2025 -0400 Merge pull request #64776 from code-dot-org/hbergam/blockly-v12 Blockly v12 Release commit 336c208c3750a38a89e35815c440f464444cecd5 Merge: 5a3011925c8 f1d99d22ffa Author: Dayne <dayne@code.org> Date: Thu May 22 12:21:57 2025 -0700 Merge pull request #66058 from code-dot-org/revert-66037-TEACH-1538/all-nested-urls-attempt-2 Revert "2nd attempt - Migrate /s/... URLs to /courses/.../units/... "nested URLs"" commit f1d99d22ffa79524087a359915937d9720baf032 Author: Dayne <dayne@code.org> Date: Thu May 22 12:21:23 2025 -0700 Revert "2nd attempt - Migrate /s/... URLs to /courses/.../units/... "nested URLs"" commit 5a3011925c8c33e6eb41c4ad5e38f8881c72357a Author: Elijah Hamovitz <elijahhamovitz@gmail.com> Date: Thu May 22 12:08:17 2025 -0700 Gzip Cached Drone Artifacts (#65936) * gzip all drone artifacts * temporarily update clone cache in this branch, so I can test without merging into actual staging * Fix yml * continue to try to figure out how drone syntax works * Revert temp changes Revert "continue to try to figure out how drone syntax works" This reverts commit ad2b2b53f37a1211deb75ec24a2f26b115f73ef1. Revert "Fix yml" This reverts commit 5295c0308531052fcfa953dd9ee2b755cefbb156. Revert "temporarily update clone cache in this branch, so I can test without merging into actual staging" This reverts commit 31250572794af219640c81ca6d123095990eea86. * temporarily revert all changes to test timing * Revert "temporarily revert all changes to test timing" This reverts commit a511c191a8829d4806fd3ea389e987a8fd915037. * resign drone.yml after updates * update drone signature after merge commit 977dd077a752f2af2744c767082106210223771f Author: Artem Vavilov <artem.vavilov.7@gmail.com> Date: Thu May 22 22:05:01 2025 +0300 CMS-722: Move Hamburger menu UI test to Header integration tests (#66026) commit 3863b3fde554f1896f3c7003ea1c7ad7ee46acf1 Merge: 57dd1a2d9e1 8ac10cbe370 Author: denyslevada <levada.denys@gmail.com> Date: Thu May 22 21:41:44 2025 +0300 Merge remote-tracking branch 'origin/staging' into denys/cms/cms-696-2 # Conflicts: # frontend/apps/marketing/src/components/contentful/actionBlocks/defaultActionBlock/ActionBlock.tsx # frontend/apps/marketing/src/components/contentful/actionBlocks/fullWidthActionBlock/FullWidthActionBlock.tsx commit 8ac10cbe370b0e44e26065bf638d63ec2739307b Author: Brendan Reville <breville@users.noreply.github.com> Date: Thu May 22 11:31:28 2025 -0700 Music: tune sharp symbol (#66040) commit 3e01badc6d915f5859277996451ee189fcb727ec Merge: eaa564b4822 bd84d2d2d66 Author: denyslevada <levada.denys@gmail.com> Date: Thu May 22 21:30:56 2025 +0300 Merge remote-tracking branch 'origin/staging' into denys/dsco/update-colors-1 commit 9eaa3c06ecbdc61d988339ab430b42bd15e0f579 Author: Kelby Hawn <9256643+kelbyhawn@users.noreply.github.com> Date: Thu May 22 11:24:25 2025 -0700 fix(marketing): allows Video and ActionBlock components to be hidden (#66045) commit 57dd1a2d9e1048e5843c581c7c1f449872947b7c Merge: 065922c37ad bd84d2d2d66 Author: denyslevada <levada.denys@gmail.com> Date: Thu May 22 21:23:18 2025 +0300 Merge remote-tracking branch 'origin/staging' into denys/cms/cms-696-2 commit bd84d2d2d66391aefd182f02856a12bba51034e4 Merge: b2f97fbbf6b 703b411c801 Author: Dayne <dayne@code.org> Date: Thu May 22 11:17:12 2025 -0700 Merge pull request #66041 from code-dot-org/TEACH-1538/temporarily-remove-permanent-redirect Temporarily disable permanent redirect for level URLs commit b1849de95273f27e94a64c47bb814661328dd621 Author: Bethany Connor <46464143+bethanyaconnor@users.noreply.github.com> Date: Thu May 22 14:16:27 2025 -0400 Update AIF homepage banner link commit b2f97fbbf6bd9da0076d8b559bb01a8bc9d99177 Merge: 52fd9bd52df 2cc9256c330 Author: wilkie <david.wilkinson@code.org> Date: Thu May 22 14:06:43 2025 -0400 Merge pull request #66035 from code-dot-org/i18n-sync-down-out-05-21-2025 I18n sync Down & Out 05/21 commit 73c82ed396cc2d763a7a17669cebee54c49b165c Author: Molly Moen <molly@code.org> Date: Thu May 22 11:01:47 2025 -0700 put theme in header commit 52fd9bd52df69b8a4eca33d3e8d4ff5bd6e22bbe Author: Brendan Reville <breville@users.noreply.github.com> Date: Thu May 22 10:53:04 2025 -0700 Music: absolute tune notes (#66025) commit f9f0b8d33c1363c0a133986c4c28d3e4d0a51057 Merge: 5331be68e7c 73a7e4e31d0 Author: Code.org Deploy Systems <dev@code.org> Date: Thu May 22 07:48:19 2025 -1000 Merge pull request #66054 from code-dot-org/staging commit 065922c37ad30b65bac41528a98a59c55028d0fb Author: denyslevada <levada.denys@gmail.com> Date: Thu May 22 20:45:34 2025 +0300 feat(actionBlocks): hide download video button commit 73a7e4e31d0955d2b0c0a6344dde08396596ceb2 Author: bencodeorg <ben@code.org> Date: Thu May 22 10:43:30 2025 -0700 Skip failing eyes test (#66053) commit 725ebd89e8053af15d3aff6424c0fd00c9abeaa2 Author: Stephen Liang <538214+stephenliang@users.noreply.github.com> Date: Thu May 22 10:37:07 2025 -0700 feat(cache): reduce revalidate period to 15 min This PR reduces the revalidate period to 15 mins for which a page is considered "fresh" to the upstream requester. The Code.org infrastructure currently has two upstream caches in a sequential chain: 1. Marketing CDN 2. Code.org front door CDN (targeted to be removed in the future) When this revalidate parameter is sent, it can take a total of [revalidate] * [number of upstream chains+1] seconds With the current value being 15 minutes, it can therefore take [900] * [2 + 1] = 45 minutes for a page to be updated. commit c96c393b3074b11e29af180fe311efed51975313 Merge: e413aff889b d75e7353be5 Author: Ryan Driscoll <ryan.driscoll@code.org> Date: Thu May 22 11:35:08 2025 -0600 Merge pull request #66013 from code-dot-org/ryan/workshops/fix/repair-custom-dropdown-layout-after-dsco-change fix(workshops): repair custom dropdown layout after dsco change commit e413aff889bf34000023675281ab30cd7338a851 Merge: df11a79c9e0 4a80d0baf36 Author: Ryan Driscoll <ryan.driscoll@code.org> Date: Thu May 22 11:34:51 2025 -0600 Merge pull request #65916 from code-dot-org/ryan/workshops/chore/clean-up-from-workshop-refactor-launch chore(workshops): clean up from workshop refactor launch commit 1d893c4c104542f637232cc7384d3223f20f44f7 Author: Stephen Liang <538214+stephenliang@users.noreply.github.com> Date: Thu May 22 08:48:07 2025 -0700 bypass error in console for favicon commit baa58538b72b4021f0380e476120be47c556be3d Author: Stephen Liang <538214+stephenliang@users.noreply.github.com> Date: Thu May 22 07:24:18 2025 -0700 Ensure 404 page has a title and update images commit efe63605c545233ba3466700f675d9ef6fd7966f Author: Stephen Liang <stephenliang@users.noreply.github.com> Date: Wed May 21 15:08:48 2025 -0700 Update frontend/apps/marketing/src/components/error/Error.tsx Co-authored-by: Kelby Hawn <9256643+kelbyhawn@users.noreply.github.com> commit 11b1f0e95bf3f987e92030f62c24d02717f8f47f Author: Stephen Liang <stephenliang@users.noreply.github.com> Date: Wed May 21 15:08:30 2025 -0700 Update frontend/apps/marketing/src/components/error/error.module.scss Co-authored-by: Kelby Hawn <9256643+kelbyhawn@users.noreply.github.com> commit 02d7e2e300d8d53025170a6c5d24994c9f456330 Author: Stephen Liang <538214+stephenliang@users.noreply.github.com> Date: Wed May 21 10:50:31 2025 -0700 feat(errors): add error boundary commit 580183b7fdffced6c5a8d6e031345a8235be8bea Author: Stephen Liang <538214+stephenliang@users.noreply.github.com> Date: Tue May 20 15:39:43 2025 -0700 feat(newrelic): add new relic browser This PR instruments the browser application with new relic's browser instrumentation. commit e68b4f7343a12806649e73f6880075f4050d1ec4 Author: Turner Riley <turner.riley@code.org> Date: Thu May 22 13:21:55 2025 -0400 clear url param after each test commit df11a79c9e07d1f6af0805608e787c1fc1e67033 Author: Continuous Integration <dev@code.org> Date: Thu May 22 17:01:16 2025 +0000 update trusted proxy list for cloudfront servers commit eaa564b4822b75f744db6de81cd917875c303575 Author: denyslevada <levada.denys@gmail.com> Date: Thu May 22 19:33:45 2025 +0300 feat(colors): update colors.scss commit d6430b1466008cee0b2133ddc3a48e3f62a56db7 Author: denyslevada <levada.denys@gmail.com> Date: Thu May 22 19:31:52 2025 +0300 feat(primitiveColors): update primitiveColors.scss commit 740c37bb8da89873a68e1ad618628264784db759 Author: Ryan Driscoll <driscollrp@gmail.com> Date: Thu May 22 09:59:42 2025 -0600 feat: add guard to query to ensure the user exists and is a teacher commit fd7da1910a045d8d2ce97baf3c10bcf7330de9eb Author: Ryan Driscoll <driscollrp@gmail.com> Date: Wed May 21 14:54:48 2025 -0600 fix: ensure local variable is set for other renderings of the school info interstitial partial commit ee53ccb8246b5d7f86536933da5ea18d742cd37d Author: Ryan Driscoll <driscollrp@gmail.com> Date: Wed May 21 09:57:39 2025 -0600 refactor: still fetch the user's existing school info so we can pre-fill their zip code and fetch the nces schools immediately commit 609edeee5bd5300ed261a50c8c29e26753814f8f Author: Ryan Driscoll <driscollrp@gmail.com> Date: Wed May 21 08:53:15 2025 -0600 refactor: remove unnecessary callback pattern and just return the promise to error can be handled commit 5176b5ee2b1ca5e761f20199b75ba06583db31ca Author: Ryan Driscoll <driscollrp@gmail.com> Date: Tue May 20 15:41:04 2025 -0600 feat: use temporary affectedByMissingSchoolData variable to conditionally handle affected users' need to update their school info commit a64327927806ffd2bebdba5c9a9fab8bb6f402fa Author: Ryan Driscoll <driscollrp@gmail.com> Date: Tue May 20 15:34:20 2025 -0600 feat: determine which users were affected by the nces school data outage and show them the school info interstitial, passing script data prop commit c36ef0cb28799213de1cf58a6e8390f6566efd98 Author: Ryan Driscoll <driscollrp@gmail.com> Date: Tue May 20 15:20:57 2025 -0600 chore: remove unused local variables commit 6ace7e10e4f640e1b88c8e1b124c35fc60961716 Author: Ryan Driscoll <driscollrp@gmail.com> Date: Tue May 20 15:17:55 2025 -0600 feat: add loading state to schools list dropdown commit 39d4a2c748aec8223b42c80623fa889a350600ad Author: Turner Riley <turner.riley@code.org> Date: Thu May 22 11:43:30 2025 -0400 pr feedback commit 7f0f87d5fc82323f52796bddd4e4eac1712487af Merge: edc51821eca aa14747f7c0 Author: Stephen Liang <stephenliang@users.noreply.github.com> Date: Thu May 22 06:39:02 2025 -0700 Merge pull request #65983 from code-dot-org/stephen/vercel-otel feat(otel): add nodejs backend otel instrumenetation commit aa14747f7c08166ecd7693a4404c6b08147344f2 Author: Stephen Liang <538214+stephenliang@users.noreply.github.com> Date: Tue May 20 15:41:35 2025 -0700 change instrumentation env var to be more generic commit 3c6381999e5bf3e59d0ec7d439ea0f3223458756 Author: Stephen Liang <538214+stephenliang@users.noreply.github.com> Date: Thu May 8 16:31:45 2025 -0700 feat(otel): add nodejs backend otel instrumenetation This PR adds the ability to collect the Next.js opentelemetry built-in instrumentation and also our own custom instrumentation and emit to an arbitrary otel collector (new relic in our case). To accomplish this, the following instrumentations were added: 1. Node.js auto instrumentation a. Pino auto instrumentation (for structured logs) 2. OTEL log exports (via pino) 3. OTEL trace exports Additionally, some custom filters were added to prevent some noisy traces which would run up our data costs on New Relic. commit edc51821eca18ea99064333d5b5f36e593049f22 Merge: d12db20861a edc7927d887 Author: Stephen Liang <stephenliang@users.noreply.github.com> Date: Thu May 22 05:31:42 2025 -0700 Merge pull request #66036 from code-dot-org/stephen/fix-content-editor-tools fix(tools): update to use dynamic path slug commit ebe08603b481645229568a71403806d027ee909d Merge: 21e5a51dc8a 49e121ddaa9 Author: Code.org Deploy Systems <dev@code.org> Date: Wed May 21 23:25:29 2025 -1000 Merge pull request #66043 from code-dot-org/dtl_candidate_0e62455c commit 49e121ddaa9c9bb3f3724bbd80a1121c18698c0f Merge: 21e5a51dc8a 0e62455ceef Author: Continuous Integration <dev@code.org> Date: Thu May 22 09:20:21 2025 +0000 Merge commit '0e62455c' into dtl_candidate_0e62455c commit d12db20861a4b571e1cafbf343096aaf413d09aa Merge: 52afe771791 5d74071af3c Author: Code.org Deploy Systems <dev@code.org> Date: Wed May 21 21:35:33 2025 -1000 Merge pull request #66042 from code-dot-org/dts_candidate_2025-05-22 DTS (Levelbuilder > Staging) [robo-dts] commit 5d74071af3c4393f7b150f1d46998d62e6373893 Merge: 52afe771791 21e5a51dc8a Author: Continuous Integration <dev@code.org> Date: Thu May 22 07:35:25 2025 +0000 Merge remote-tracking branch 'origin/levelbuilder' into dts_candidate_2025-05-22 commit 52afe77179125f73259f869bb81bbaaf64c46394 Author: Continuous Integration <dev@code.org> Date: Thu May 22 07:30:25 2025 +0000 staging content changes (-robo-commit) commit 21e5a51dc8adb479e3d1a67f30a386d71f09c220 Author: Continuous Integration <dev@code.org> Date: Thu May 22 07:30:12 2025 +0000 levelbuilder content changes (-robo-commit) commit 703b411c801d3117169420ffd1fc8b5d750e6e72 Author: Dayne <dayne@code.org> Date: Wed May 21 23:08:26 2025 -0700 Temporarily disable permanent redirect for Units URLs commit 528a516299db369d9678c1c0155c51b4d3b45efd Merge: 71e1222d821 700981905b6 Author: Dayne <dayne@code.org> Date: Wed May 21 20:38:54 2025 -0700 Merge pull request #66037 from code-dot-org/TEACH-1538/all-nested-urls-attempt-2 2nd attempt - Migrate /s/... URLs to /courses/.../units/... "nested URLs" commit 5331be68e7cf553a60b5c5ba6992de723c31dee5 Merge: 0e62455ceef 71e1222d821 Author: Code.org Deploy Systems <dev@code.org> Date: Wed May 21 16:50:18 2025 -1000 Merge pull request #66038 from code-dot-org/staging commit 71e1222d82146c0933948fd3eb3ff702cf78c8de Author: Brendan Reville <breville@users.noreply.github.com> Date: Wed May 21 18:24:24 2025 -0700 AI Tutor: initial Python Lab integration * AI Tutor: Python Lab (WIP) * Updates * Use chat component * Change model * More context * Support for user questions * Updates * Updates * Log usage * Level property to show tutor * AiTutor -> AiTutor2 * Missed files * Fix logging * Clear hint response when level changed * Updates * Handle no validations * Recreate AITutorManager on level change * AITutor2UI -> AITutor2Chat & AITutor2Response * Responsive layout for chat * useAiTutor2 Hook (#65997) * useAiTutor2 Hook * Remove AiTutor2Response * Add type * Fix text styling * Fix styling * Fix unit test * Update function name --------- Co-authored-by: Sanchit Malhotra <85528507+sanchitmalhotra126@users.noreply.github.com> commit 89cea1b49684e75253e48f3e9b90c10b32bf0b5f Merge: b1a2066daa4 c37ab29134a Author: wilkie <david.wilkinson@code.org> Date: Wed May 21 19:56:57 2025 -0400 Merge pull request #66020 from code-dot-org/i18n-sync-in-up-05-21-2025 I18n sync In & Up 05/21 commit f6c0b1a2ffac238cbb5f3e5adec52cf97625b82b Author: Molly Moen <molly@code.org> Date: Wed May 21 16:08:32 2025 -0700 make afe dialog readable commit 34075ee45d5a2bc3be8507e7c4cc50e076ed84d1 Author: Molly Moen <molly@code.org> Date: Wed May 21 15:48:35 2025 -0700 work in progress commit 700981905b6e9a1cdd40ac5a2d646373d4bbddec Author: Dayne <dayne@code.org> Date: Wed May 21 15:44:45 2025 -0700 Removed Experiment usage for 'modularity'. Use only DCDO commit 98784b9c5e000e5ddacda450c56c8d6d78988e7d Author: Dayne <dayne@code.org> Date: Wed May 21 15:47:18 2025 -0700 Revert "Revert "Migrate /s/... URLs to /courses/.../units/... "nested URLs". (#65034)" (#66033)" This reverts commit b1a2066daa42152f76cca0b3e6a667fa02b9e690. commit edc7927d887eaa31f916959f6b35fa201b3baa8e Author: Stephen Liang <stephenliang@users.noreply.github.com> Date: Wed May 21 15:47:02 2025 -0700 Update frontend/apps/marketing/src/components/contentEditorHelper/Tools/Tools.tsx commit b353f8013aaffe1272694fb9c24b9cc5caeffc4d Author: Stephen Liang <538214+stephenliang@users.noreply.github.com> Date: Wed May 21 15:30:22 2025 -0700 fix(tools): update to use dynamic path slug The page path slug was changed to be multi-directory, update the tool to join those slugs. commit 2cc9256c330371688adbf71f3b56a67a4a258b67 Author: Continuous Integration <dev@code.org> Date: Wed May 21 21:57:44 2025 +0000 hoc i18n updates commit b1ca0de13819aa09ef6b8f2724a75d3796bbdc93 Author: Continuous Integration <dev@code.org> Date: Wed May 21 21:56:54 2025 +0000 apps i18n updates commit 3b31857b1a207b7efa1789b604ecaf5415874b2b Author: Continuous Integration <dev@code.org> Date: Wed May 21 21:56:16 2025 +0000 dashboard i18n updates - Chinese Traditional commit a7a559e3eaba29a4d26e18230f94fdef843e2d70 Author: Continuous Integration <dev@code.org> Date: Wed May 21 21:55:58 2025 +0000 dashboard i18n updates - Chinese Simplified commit dde53082c6d760e2aaa0598ee5ed58068ef0cebc Author: Continuous Integration <dev@code.org> Date: Wed May 21 21:55:41 2025 +0000 dashboard i18n updates - Vietnamese commit 693e6e698c3e853ce90cc7763c1567fb1f30f69c Author: Continuous Integration <dev@code.org> Date: Wed May 21 21:55:22 2025 +0000 dashboard i18n updates - Uzbek commit bb77e5a28b4b0baf25b2153615e2adf626b1ec46 Author: Continuous Integration <dev@code.org> Date: Wed May 21 21:55:04 2025 +0000 dashboard i18n updates - Urdu (Pakistan) commit 5cc3e60c9e9b8431d9b787b81a88e274643d83bf Author: Continuous Integration <dev@code.org> Date: Wed May 21 21:54:46 2025 +0000 dashboard i18n updates - Ukrainian commit e850366aa86e4623e58acbe5512458ac1bcb33c0 Author: Continuous Integration <dev@code.org> Date: Wed May 21 21:54:28 2025 +0000 dashboard i18n updates - Turkish commit 3aba2654d6252afc19f6b26147dc8b7b78c8b771 Author: Continuous Integration <dev@code.org> Date: Wed May 21 21:54:09 2025 +0000 dashboard i18n updates - Thai commit 7ffa6095dc5a398e74ec34306740124496edea2c Author: Continuous Integration <dev@code.org> Date: Wed May 21 21:53:36 2025 +0000 dashboard i18n updates - Telugu commit 2854c2b294648ecbec66564610852607b23095ac Author: Continuous Integration <dev@code.org> Date: Wed May 21 21:53:18 2025 +0000 dashboard i18n updates - Tamil commit 051a67684d39e747b13ae5f62300b1359443de82 Author: Continuous Integration <dev@code.org> Date: Wed May 21 21:53:00 2025 +0000 dashboard i18n updates - Swedish commit d2affbee6978f5bdc5a9bafe2fbc6f76c3ac300c Author: Continuous Integration <dev@code.org> Date: Wed May 21 21:52:42 2025 +0000 dashboard i18n updates - Serbian (Cyrillic) commit e3240da89aeaf3b60e2419bf85096a1bb9233f25 Author: Continuous Integration <dev@code.org> Date: Wed May 21 21:52:24 2025 +0000 dashboard i18n updates - Albanian commit 0e62455ceeffb501b5acfec430cdc7f83329fbe2 Merge: ba1def92cdb b1a2066daa4 Author: Code.org Deploy Systems <dev@code.org> Date: Wed May 21 11:52:19 2025 -1000 Merge pull request #66034 from code-dot-org/staging commit 0bc92df9baa5e9c335e4616048819cd093feeec2 Author: Continuous Integration <dev@code.org> Date: Wed May 21 21:52:06 2025 +0000 dashboard i18n updates - Slovenian commit 2ef4f41a8c154d18f0d178c8868093d23dfb2ad1 Author: Continuous Integration <dev@code.org> Date: Wed May 21 21:51:48 2025 +0000 dashboard i18n updates - Slovak commit 046dc1fc72dda3e2d42465679dc1ead16d3e1dde Author: Continuous Integration <dev@code.org> Date: Wed May 21 21:51:30 2025 +0000 dashboard i18n updates - Sinhala commit 2afdb62d338e342d63c77e490d7dae40b298699a Author: Continuous Integration <dev@code.org> Date: Wed May 21 21:51:12 2025 +0000 dashboard i18n updates - Samoan commit ae695109468de487e60a0275e588e528ead79f52 Author: Continuous Integration <dev@code.org> Date: Wed May 21 21:50:54 2025 +0000 dashboard i18n updates - Northern Sami commit b1a2066daa42152f76cca0b3e6a667fa02b9e690 Author: Dave Bailey <davidsbailey@users.noreply.github.com> Date: Wed May 21 14:50:37 2025 -0700 Revert "Migrate /s/... URLs to /courses/.../units/... "nested URLs". (#65034)" (#66033) This reverts commit f97bbcef80c2d30dfe1b50f95d684e2b20c4ba44. commit c6bfeae2981bc29e19c0e32dc178c8f6cf5e6d40 Author: Continuous Integration <dev@code.org> Date: Wed May 21 21:50:36 2025 +0000 dashboard i18n updates - Russian commit 530b1f8023439e8be1d64459d9c5788067b7ab45 Author: Continuous Integration <dev@code.org> Date: Wed May 21 21:50:18 2025 +0000 dashboard i18n updates - Romanian commit 0c168de8e4008ed37412235e4ac71f8411bc8900 Author: Continuous Integration <dev@code.org> Date: Wed May 21 21:50:00 2025 +0000 dashboard i18n updates - Portuguese commit 8cc047737d4adc1534d99d6025b2ed02b2da900e Author: Continuous Integration <dev@code.org> Date: Wed May 21 21:49:41 2025 +0000 dashboard i18n updates - Portuguese, Brazilian commit f901c8cb64a91a596f49589309088d86799ede07 Author: Continuous Integration <dev@code.org> Date: Wed May 21 21:49:08 2025 +0000 dashboard i18n updates - Polish commit ff9f9ec065307e6c96162cc07f22be4b5e7ed942 Author: Continuous Integration <dev@code.org> Date: Wed May 21 21:48:49 2025 +0000 dashboard i18n updates - Norwegian commit df45d122745cfd3fdd92146fceba56fdb89bfe5e Author: Continuous Integration <dev@code.org> Date: Wed May 21 21:48:32 2025 +0000 dashboard i18n updates - Norwegian Nynorsk commit f2bd50f4bac91b17495a2878d30733f402313ce5 Author: Continuous Integration <dev@code.org> Date: Wed May 21 21:48:14 2025 +0000 dashboard i18n updates - Dutch commit 5f027ac8ea3f891330dbfc415a19d7536aab099d Author: Continuous Integration <dev@code.org> Date: Wed May 21 21:47:56 2025 +0000 dashboard i18n updates - Nepali commit 92194383985cb4746b3fc51ab9b4d5c42b5402a5 Author: Continuous Integration <dev@code.org> Date: Wed May 21 21:47:08 2025 +0000 dashboard i18n updates - Malay commit 3008acba75f465596addfa8c400a2fc608850fc8 Author: Continuous Integration <dev@code.org> Date: Wed May 21 21:46:49 2025 +0000 dashboard i18n updates - Marathi commit a187a494569a4d74e7b7c62b6603ef26973c5c58 Author: Continuous Integration <dev@code.org> Date: Wed May 21 21:46:31 2025 +0000 dashboard i18n updates - Mongolian commit 86eff54b4c928449a62dd33be31d19c16f574478 Author: Continuous Integration <dev@code.org> Date: Wed May 21 21:46:13 2025 +0000 dashboard i18n updates - Macedonian commit a7b7ed951a1e017954821d45822438a61c7168b3 Author: Continuous Integration <dev@code.org> Date: Wed May 21 21:45:55 2025 +0000 dashboard i18n updates - Maori commit f1f12e49997376fa305b2d61d25bb7c1b12494a9 Author: Continuous Integration <dev@code.org> Date: Wed May 21 21:45:37 2025 +0000 dashboard i18n updates - Latvian commit 299c2e10b7f0170104f7b4c1f75b9ccdfb624239 Author: Continuous Integration <dev@code.org> Date: Wed May 21 21:45:19 2025 +0000 dashboard i18n updates - Lithuanian commit cc73f4f54f20738d88054954aad37b9dc656cf5a Author: Continuous Integration <dev@code.org> Date: Wed May 21 21:44:47 2025 +0000 dashboard i18n updates - Kurdish commit 5e1531dfdfe0f93c886b628edbb1f2fc9f9a555c Author: Continuous Integration <dev@code.org> Date: Wed May 21 21:44:28 2025 +0000 dashboard i18n updates - Korean commit b87d64d2c92cd6d5e7bd9235eef8b5a57c0be9b7 Author: Continuous Integration <dev@code.org> Date: Wed May 21 21:44:10 2025 +0000 dashboard i18n updates - Khmer commit e844516e3370a26be8cdc7fa9a6c5522d71f38b9 Author: Continuous Integration <dev@code.org> Date: Wed May 21 21:43:53 2025 +0000 dashboard i18n updates - Kannada commit 5570a495d26c9b3c45244c0c26b89a0501d1d1da Author: Continuous Integration <dev@code.org> Date: Wed May 21 21:43:35 2025 +0000 dashboard i18n updates - Kazakh commit 2db7df51bbe4982bf621bdd64e049f2e212c9549 Author: Continuous Integration <dev@code.org> Date: Wed May 21 21:43:16 2025 +0000 dashboard i18n updates - Georgian commit ee4a72b49905f75e85db1047c6615aa2c983b383 Author: Continuous Integration <dev@code.org> Date: Wed May 21 21:42:58 2025 +0000 dashboard i18n updates - Japanese commit af7c1947b394fa327e6580178f9175f3c0d7f160 Author: Continuous Integration <dev@code.org> Date: Wed May 21 21:42:40 2025 +0000 dashboard i18n updates - Italian commit 0fc1cda1f5ea0eb377f7d511eb50640b328b8a74 Author: Continuous Integration <dev@code.org> Date: Wed May 21 21:42:22 2025 +0000 dashboard i18n updates - Icelandic commit b73f9ad0dab3826ca52bb023cf7f91ffdd076662 Author: Continuous Integration <dev@code.org> Date: Wed May 21 21:41:49 2025 +0000 dashboard i18n updates - Indonesian commit 2bdf137a96466223900fc7993bfdf11ceb8714bd Author: Continuous Integration <dev@code.org> Date: Wed May 21 21:41:31 2025 +0000 dashboard i18n updates - Armenian commit 2957b67be86128338dc5b5878fb45962de663d52 Author: Continuous Integration <dev@code.org> Date: Wed May 21 21:41:13 2025 +0000 dashboard i18n updates - Hungarian commit c00607872011965835c360470a3605124792061c Author: Continuous Integration <dev@code.org> Date: Wed May 21 21:40:55 2025 +0000 dashboard i18n updates - Croatian commit a20ca6d5fde555ffb15f446e931599e75a24c7c0 Author: Continuous Integration <dev@code.org> Date: Wed May 21 21:40:37 2025 +0000 dashboard i18n updates - Hindi commit 2fe107b2a71e1a2b64ed1a6cd62952788878eaca Author: Continuous Integration <dev@code.org> Date: Wed May 21 21:40:19 2025 +0000 dashboard i18n updates - Hebrew commit 813c9da331106968dd5491370ef607f394fd2fb6 Author: Continuous Integration <dev@code.org> Date: Wed May 21 21:39:46 2025 +0000 dashboard i18n updates - Galician commit 3b63f55d8e95cde0df7a525f463e8ea72f62fbc6 Author: Continuous Integration <dev@code.org> Date: Wed May 21 21:39:28 2025 +0000 dashboard i18n updates - Irish commit 6ba109355fceeebc959bf04d5d4bfa1bea3bbeca Author: Continuous Integration <dev@code.org> Date: Wed May 21 21:39:10 2025 +0000 dashboard i18n updates - French commit b762b7d919e141afd5887546f2888f559d617377 Author: Continuous Integration <dev@code.org> Date: Wed May 21 21:38:52 2025 +0000 dashboard i18n updates - Filipino commit 40b9c9a5c5473372489279fd4f6e06c25b7ef809 Author: Continuous Integration <dev@code.org> Date: Wed May 21 21:38:34 2025 +0000 dashboard i18n updates - Finnish commit 059aedda03b8abee60d44b91d41d29c65955ec8c Author: Continuous Integration <dev@code.org> Date: Wed May 21 21:38:17 2025 +0000 dashboard i18n updates - Persian commit bcd097783e8c63baa6e74ce8a7d84e45b7712630 Author: Continuous Integration <dev@code.org> Date: Wed May 21 21:37:43 2025 +0000 dashboard i18n updates - Basque commit 779c40c02c61f9f5534ec11a30cf399a1cee503a Author: Continuous Integration <dev@code.org> Date: Wed May 21 21:37:25 2025 +0000 dashboard i18n updates - Estonian commit 45711eda72199decfeb23142a309e02b3a51bb8c Author: Continuous Integration <dev@code.org> Date: Wed May 21 21:37:07 2025 +0000 dashboard i18n updates - Spanish, Mexico commit 858826bc6e406831fcfb5712aeca6690a6760303 Author: Continuous Integration <dev@code.org> Date: Wed May 21 21:36:48 2025 +0000 dashboard i18n updates - Spanish commit 269a0360f9c74d24e1873c98a8e541c1bd9185cd Author: Continuous Integration <dev@code.org> Date: Wed May 21 21:36:15 2025 +0000 dashboard i18n updates - Greek commit 3835007ddc00a412cdd194145fb7d231ce3f92da Author: Continuous Integration <dev@code.org> Date: Wed May 21 21:35:42 2025 +0000 dashboard i18n updates - German commit c30d7aa1fb05690274720c66761dd6a471ebc529 Author: Continuous Integration <dev@code.org> Date: Wed May 21 21:35:24 2025 +0000 dashboard i18n updates - Danish commit 88b68817aac9209d91b0c0afea8fd618b9b74bd1 Author: Continuous Integration <dev@code.org> Date: Wed May 21 21:35:06 2025 +0000 dashboard i18n updates - Czech commit b46b7f828024cb0a91da2a56d5dce7fe07f764d1 Author: Continuous Integration <dev@code.org> Date: Wed May 21 21:34:33 2025 +0000 dashboard i18n updates - Catalan commit 00a8b451d3dd919773063787f51ac48fa93d03a3 Author: Continuous Integration <dev@code.org> Date: Wed May 21 21:34:15 2025 +0000 dashboard i18n updates - Bosnian commit 3d275b476c164abf96d8d6f7fab1cbac685aa0ed Author: Continuous Integration <dev@code.org> Date: Wed May 21 21:33:43 2025 +0000 dashboard i18n updates - Bulgarian commit ad1aa2e0df5d4423b7be48acdd7656a2cc8bef6c Author: Continuous Integration <dev@code.org> Date: Wed May 21 21:33:24 2025 +0000 dashboard i18n updates - Azerbaijani commit 0c7432c864bc008044891a696861a52262ed2ce1 Author: Continuous Integration <dev@code.org> Date: Wed May 21 21:33:06 2025 +0000 dashboard i18n updates - Arabic commit 2216406ee9c2e1cc8cdd5951583176475a1977aa Au…

…Stacks (#65584) * move gh user to iam stack * Initial attempt at creating IAM Users for GitHub Actions to deploy marketing sites. * Updates based on feedback. * Fix syntax error. * Provision Open ID Connect for GitHub Actions to authenticate to AWS and grant permissions to provision development, test, and production marketing sites Stacks. * Add Permissions Boundary to constrain Roles created by marketing sites deployers. * Add a Permissions Boundary to constrain the Roles that marketing sites Stacks can provision. * The Deny statement is redundant. * Restrict the certificate that the marketing sites deployer can create to specific domain names. * Export marketing sites permissions boundary. * Enable GitHub Actions to flush CloudFront cache. * Fix missing quotes and update the expected S3 bucket naming pattern. * Remove non-alpha and add required trailing slash. * Fix embarrassing syntax error. * Adopt UpperCamelCase for Role Name to align with AWS Role naming conventions. * Permit Developers to use the CloudFormationServiceMarketingSitesDevelopmentRole to create/update Stacks. * oops, let's also allow the Marketing Sites Test Role. * Grant Delete/Detach/Deregister/etc for any resource where we've granted create/update. * Fix how tags constrain permissions. * Adjust RequestCertificate permissions. * Fix Request Certificate permissions. * TODO: Undo this temporary relaxing of permissions. * Revert "Fix how tags constrain permissions." This reverts commit 47c13a5af71f551df06b64484c48c733749d35c2. * Remove Development Role and relax permissions for Test and Production Roles to act on any Resource. * Fix permissions to provision S3 Buckets. * We were missing TagRole permission on the Marketing Sites deployer Role. * Improve Permissions Boundary Co-authored-by: Dave2 Buchanan <146779710+unlox775-code-dot-org@users.noreply.github.com> * Use ERB to dynamically generate some ARNs. * Fix some syntax errors. * Fix permissions needed to delete/update a marketing site stack. * No need to impose the DevPermissions boundary on Marketing Sites Deployer Role. * Tweak some permissions. * Relax ECS Task Definition ARN naming convention. * Fix Task Definition ARN pattern. * Add some missing permissions. * Adding permissions to provision Elastic File System. * ecs:DeregisterTaskDefinition was listed twice. * Relax Elastic File System permissions. * Revert "Relax Elastic File System permissions." This reverts commit 6cd3403c16781a6716a386ed1a1f398d57f7a4a9. * EC2 permissions needed to get Elastic File System working. * Tweak permissions. * DNS for load balancer wasn't working without this. * Fix syntax error. * Relax ECS Service identifier. * Add missing permission. * Tweak permissions. * More tweaks. * More permission tweaks. * Fix passrole for auto scaling role. * Relax passrole to get Auto Scaling Role working. * expand permission boundary to accomodate additional policies needed by marketing sites auto scaling role * Auto Scaling Role needs additional permissions so expand the boundary * The CloudWatch resources aren't created by a marketing stack and don't have the tag. * Expand permissions for scaling policies. * Squashed commit of the following: commit e60e63497676ab08d19e2da6d85dc1ed1b5f9313 Merge: 1ccc1c47f41 4a3511b88b5 Author: Dayne <dayne@code.org> Date: Tue May 27 15:22:17 2025 -0700 Merge pull request #66111 from code-dot-org/TEACH-1915/fix-unit-title-in-unit-summarize Fix Unit title in Unit#summarize* methods commit 1ccc1c47f4107822740fac52edd1a0cc9af4f05b Author: Artem Vavilov <artem.vavilov.7@gmail.com> Date: Wed May 28 00:48:43 2025 +0300 fix(Alert): improve text with link layout responsiveness (#66132) commit abafb749eaec370be710241a55efa4ff9069a60b Author: Elijah Hamovitz <elijahhamovitz@gmail.com> Date: Tue May 27 14:47:09 2025 -0700 Always Use Drone Cache In PRs (#65765) * extract CI test setup operations into their own scripts * move CI scripts into their own subdirectory * update references to moved scripts * expand our existing strategy for caching the results of a git clone to also cache the results of a db seed * don't update the cache that's actually being used while we're still experimenting * temporarily target feature branch for cache clone to pick up new functionality * use working dir rather than /tmp/ to share file between steps * use new cache in UI test * use volumes rather than working directory to share cache between steps * make ui test prep script executable for use in cache pipeline * Revert "use volumes rather than working directory to share cache between steps" This reverts commit e4d49c5775f8aa63ec003e49ab776b2eeca6d4dc, for testing purposes * Revert "Revert "use volumes rather than working directory to share cache between steps"" This reverts commit c489c9e754c02aeb12553d8555404bcfc1e73636 now that we've tested without it * remove old caching strategy in favor of incremental seed from an externally-managed cache * remove lingering references to old caching strategy * gzip cache files * always use incremental seed for UI tests * entirely remove broken logic * revert temp changes now that we have some test build artifacts generated * restore caches to absolute rather than relative paths * try some manual approaches to restoring the cache data to a non-working-directory volume * try another automatic method for extracting cache to volume * fall back to manual cache restoration * Revert "fall back to manual cache restoration" This reverts commit 23aebac82d1a246937d27c31f623b82812e37100. * rather than trying to move the restored data into the volume, mount the volume at the path the data is going to be restored to * try relative paths * Revert "try relative paths" This reverts commit 692c9a065814e929df7f7d6f59ef67dcb90b6f33. * cache just dashboard db, rather than all of mysql * typo fix * serialize and deserialize dashboard data rather than just trying to cache the directory * load cache before running seed * restore update cache step now that we've updated the generated data * regenerate build artifacts with encryption key * Revert "regenerate build artifacts with encryption key" This reverts commit 512d22becc30d1b006bba53d598faf4cb4ee20bd. * do a full rather than incremental reseed, just to see how much time that adds * clean up some comments * re-sign drone * restore mysql cache to a volume * try again to figure out what breaks when we restore mysql cache to a volume * generate new artifact tarball * can't set user automatically when extracting; try setting manually after extraction * don't try to create database; it should already exist * clean up names and comments * remove temp changes * re-sign drone * test regeneration of build artifacts * remove stray debug comment * use db:setup_or_migrate in rake install to accommodate both 'restore from cache' and 'update cache' use cases * undo temp changes * use one step for both rbenv and mysql * test regeneration of build artifacts * undo temp changes * re-sign drone commit a5de1af0bcd7817f0dfc84b339094abb2ecd469f Author: Kelby Hawn <9256643+kelbyhawn@users.noreply.github.com> Date: Tue May 27 14:32:51 2025 -0700 chore(marketing): move custom components into /components/contentful directory (#66138) * chore(marketing): move custom components into /components/contentful directory * fix failing tests commit 5af9df2e5cf3ce166653a80d46f879aa42b34958 Author: Kelby Hawn <9256643+kelbyhawn@users.noreply.github.com> Date: Tue May 27 13:20:26 2025 -0700 fix(marketing): update Error page styles (#66136) commit 8f74f2db46ecdf108c9881aaf4f071d6397633fc Author: alex-m-brown <alex.brown@code.org> Date: Tue May 27 15:26:22 2025 -0400 fix modular course progress eyes test (#66134) commit 13465d83bd4984a1705a597e3010d1558e31bcfd Author: Kelby Hawn <9256643+kelbyhawn@users.noreply.github.com> Date: Tue May 27 12:23:45 2025 -0700 feat(marketing): reorganize component sidebar (#66130) * feat(marketing): reorganize component sidebar * 02: Page Structure * 03: Content Building Blocks * 04: Layout Building Blocks * 06: Dynamic Displays * 07: Curriculum * 08: Advanced * clean up * update afe tooltip desc commit 99b4a809c4a300c5c1326a06b1a7494c66718393 Merge: 8a9fa397ad0 2721c03a052 Author: Stephen Liang <stephenliang@users.noreply.github.com> Date: Tue May 27 10:17:50 2025 -0700 Merge pull request #66128 from code-dot-org/stephen/fix-docker-build fix(turbo): enable turbo in docker commit 2721c03a0525c9d274eb658138ceb4ff8e13cdd3 Author: Stephen Liang <538214+stephenliang@users.noreply.github.com> Date: Tue May 27 09:08:43 2025 -0700 fix(turbo): enable turbo in docker The previous PR implementing local turbo missed allowing the docker build to access the local turbo instance. commit 8a9fa397ad0432df1363541b5f24200c01117973 Merge: 8368715fc67 0f186957b48 Author: Ryan Driscoll <ryan.driscoll@code.org> Date: Tue May 27 10:41:54 2025 -0600 Merge pull request #66044 from code-dot-org/ryan/workshops/feat/ws-catalog-add-tooltip-for-session-dates feat: add tooltip to more sessions text in catalog commit 8368715fc67a2780960e57fc8108e08158d04075 Author: fisher-alice <107423305+fisher-alice@users.noreply.github.com> Date: Tue May 27 11:13:48 2025 -0500 [Python Lab] Move header button tooltips to bottom (#66124) [Python Lab] Move header button tooltips to bottom commit 303926946e823433a5d5f83db7d86cedfeec0d9e Merge: 1053585116a 3818696162b Author: Molly Moen <molly@code.org> Date: Tue May 27 08:40:53 2025 -0700 Merge pull request #66064 from code-dot-org/molly/theme-share-modal Theme the lab2 share modal commit 1053585116add9f61ae4e32c5b4a5f7e125a83c2 Author: Kelby Hawn <9256643+kelbyhawn@users.noreply.github.com> Date: Tue May 27 08:37:21 2025 -0700 feat(Carousel): set allowTouchMove to true by default (#66100) commit 0ad863d16e91d13a28cf32541f7a61f794821268 Author: Kelby Hawn <9256643+kelbyhawn@users.noreply.github.com> Date: Tue May 27 08:36:15 2025 -0700 Skip more pegasus ui tests on courses_eyes.feature (#66106) * skip more pegasus ui tests on courses_eyes.feature * add comments commit 72c0755bac78b68655813de01be5e9944472a0f8 Merge: 7bef9260f61 2168ff4c9a9 Author: Mike Harvey <43474485+mikeharv@users.noreply.github.com> Date: Tue May 27 11:16:08 2025 -0400 Merge pull request #66114 from code-dot-org/mike/fix-disabled [Google Blockly] set workspace.options.disabled correctly commit 7bef9260f61f6c90a9a3ed22f4a6699094a2030a Author: alex-m-brown <alex.brown@code.org> Date: Tue May 27 11:09:02 2025 -0400 Launch Modular Course URL Change (#65582) * 'modularity' - redirection from /s/ to /courses/ * Using string substitution to simplify and support more URLs * Simplify nested course URL redirection * 'bundle update rspec' to get fixes for 'and_call_original' * Using 'and_call_original' * Removing unused code * Unit tests for ScriptsController * Unit tests for LessonsController redirect * Unit tests for ScriptLevelsController redirection * Using 'Unit' instead of 'Script' * Moving queries and services to /lib * Fixing ScriptLevelsControllerTests * Using 'redirect_to_canonical_path' * Adding support for /teacher_dashboard/courses/.../units/... * Remove debugging code * Add caching for UnitGroupUnit * Using cached UnitGroupUnit methods * Using unit.unit_group_units * removed unused method * Reusing existing cached method for 'default_unit_group_units' * Removing unused 'should_cache?' method * Added documentation * Fixed documentation * Unit tests for unit_summary API * Adding isOptionSelected support for nestedUnitOverview to the TeacherNavigationBar * Unit tests for teacher_dashboard/.../courses/.../units/... * unit_position should be an integer * Addressing PR feedback * Use course_unit_path for standalone unit redirect * Refactoring Unit methods .course_link, .course_title, and .unit_group to work with Modularity * Pausing work * Fixing unit_position comparison type mismatch * Fixing URL generation for the selected section's course/unit * Fixing unit tests for expected response of section API * Single Unit course will redirect to nested URL * Updating SectionTest with new unitPosition values * Removing redundant test configurations * Adding experiments.MODULARITY to the frontend * /courses/... pages now show nested course URLs for 'Go to Unit' buttons * progress bubbles use nested URLs * lessons_controller uses nested course paths * Migrate more unit.rb paths to be nested in a course * Adding unit_group_unit everywhere * View Unit Overview button supports nested URL * Fixing broken lesson plan page * Nested URLs in activity_sections * /courses/standards supports nested URLs * BubbleChoice, Try Now, Student Lesson Plan, and Unit Overview buttons support nested URLs * My Courses on dashboard now shows the nested URLs * valid_course_offerings API returns nested URLs * Add Jira to peer_review TODO * Rename 'script' to 'unit' * Adding TODO TEACH-1864 * Adding TODO TEACH-1865 * Adding TODO TEACH-1866 * Adding TODO TEACH-1864 * Fixing progress API call when the modularity experiement is off * Script Overview page will redirect to /s/ if the modularity experience is off * Fixing test/unit/code-studio/components/progress/UnitOverviewTopRowTest.jsx * Fixing tests to supply a path to CourseScript * Forward 'modularity' DCDO value to front-end * Fixing some UI tests * Fixing DCDO * Using keyword parameters for unit_group_unit and fixing section_text_responses API * Fixed 'params' keyword parameter usage * acquisition products tests * code tools tests * foundations tests * javalab tests * platform tests * star labs tests * step definitions tests * student learning tests * teacher tools tests * xteam and misc. tests * Added error handling for Queries::Courses.get_course_context * update steps to use new url structure * Fixing unit_group_unit.unit_group usage * match on /teacher_dashboard not teacher_dashboard * Using origin_unit_group rather than the 'first' one * Fixing a lot of unit tests, mostly related to caching * Adding nil checks * Fixing unit tests * add navigating within modular course test * Fixed number of db queries * Adding missing section_id query param * turn on modularity dcdo * fix unit tests * fix ui tests * fix more tests [test all] * fix eyes tests [test all] * Fixing 'modularity' DCDO value being passed to front-end * Changing param name to unit_name_or_id * Update route docs in lessons_controller * .unit_group_unit falls back to orignal_unit_group * Look for the next unit in the same unit group * Adding .get_unit_context tests * Testing unit_id passed to .get_course_context * Added cache test for .get_unit_context * Add error handling for 'nil' .get_unit_context * The 'Continue' button now links to a nested URL * Using nested URL for Unit link in MiddleHeader * lesson_extras_level_url in MiddleHeader uses nested URL * fix unit test * use script_next_path * Use nested unit path in TeacherNavigationBar if modularity is enabled * Adding canonical_url helper function * Revert "Adding canonical_url helper function" This reverts commit 316f660210587a9ad0324823b102acdd19b42240. * Adding nested redirect for scripts_controller :vocab, :resources, :code, :standards * scripts_controller can now redirect to nested urls in teacher_dashboard * SelfPacedProgressTable now uses nested URLs * fix ui test * Adding unitPosition to test data * Using a shared library to look up course context in script_levels_controller * Add handling for fake Units created by get_unit_family_redirect_for_user * fix unit test [test all] * Passing unit_name_or_id explicitly to canonical_path * remove todos * Delete dashboard/test/ui/features/platform/hamburger.feature * Update cookie_banner.feature * fix cookie banner eyes test [test all] --------- Co-authored-by: Dayne <dayne@code.org> commit 949f4f6911a3ff7e6708a1846a9b2bc433177946 Author: Sanchit Malhotra <85528507+sanchitmalhotra126@users.noreply.github.com> Date: Tue May 27 11:04:59 2025 -0400 Fix assessment level progress update in Lab2 (#66101) commit 0f186957b4825cde2e95f39372bad6b5817ab522 Author: Ryan Driscoll <driscollrp@gmail.com> Date: Thu May 22 12:44:56 2025 -0600 feat: add tooltip to session date detail row commit aedc6b500fe0aaf03f8011d69ef14bd56ecf2b84 Author: Mark Barnes <mark.barnes@code.org> Date: Tue May 27 09:17:27 2025 -0500 Section avatar editor backend and tests (#65979) * add avatar edit dialog * fix * update styling and add all elements * select and save working * PR updates * update avatar select button text * unit test and accessibility updates * accessibility updates * accessibility updates * unit test updates * accessibility updates and bug fixes * bug fix * remove unnecessary id * PR updates * dedupe * bug fixes * bug fixes * bug fix * test fix commit 2c2a01ee17954e8406d61f74602a27211d921c75 Merge: 454212b76a0 59822653d3f Author: Stephen Liang <stephenliang@users.noreply.github.com> Date: Tue May 27 06:47:02 2025 -0700 Merge pull request #66113 from code-dot-org/stephen/turbo-cache fix(turbo): prevent turbocache from infinitely growing commit 454212b76a084a9851479d4e533ac197344fa1dc Merge: 9dd1a430c6f 2f120bc13fd Author: Code.org Deploy Systems <dev@code.org> Date: Mon May 26 21:35:26 2025 -1000 Merge pull request #66122 from code-dot-org/dts_candidate_2025-05-27 DTS (Levelbuilder > Staging) [robo-dts] commit 2f120bc13fdb5935ea9364870d97cc69a52f779e Merge: 9dd1a430c6f 80fa62fbb74 Author: Continuous Integration <dev@code.org> Date: Tue May 27 07:35:19 2025 +0000 Merge remote-tracking branch 'origin/levelbuilder' into dts_candidate_2025-05-27 commit 9dd1a430c6f87e5792e25919270695a97a5b386c Author: Continuous Integration <dev@code.org> Date: Tue May 27 07:30:27 2025 +0000 staging content changes (-robo-commit) commit 80fa62fbb74ed126686a8c288d14bfda38423907 Author: Continuous Integration <dev@code.org> Date: Tue May 27 07:30:12 2025 +0000 levelbuilder content changes (-robo-commit) commit 4c812db2f79b6186518feb04f582c67f1ff54075 Merge: 18c3c0b4f6b 4f6c422a452 Author: Code.org Deploy Systems <dev@code.org> Date: Sun May 25 23:25:42 2025 -1000 Merge pull request #66118 from code-dot-org/dtl_candidate_105dc2fb commit 4f6c422a452f0ae0aebc64acaf2ab0b8d69bd7d1 Merge: 18c3c0b4f6b 105dc2fbfd6 Author: Continuous Integration <dev@code.org> Date: Mon May 26 09:20:22 2025 +0000 Merge commit '105dc2fb' into dtl_candidate_105dc2fb commit f3105a5575258ead93f2059a61ab49ce37e6bbda Merge: 31427f70a14 6b2c2d45300 Author: Code.org Deploy Systems <dev@code.org> Date: Sun May 25 21:42:00 2025 -1000 Merge pull request #66116 from code-dot-org/dts_candidate_2025-05-26 DTS (Levelbuilder > Staging) [robo-dts] commit 6b2c2d45300e824ece6d7ff55f7e06365d7e5cb6 Merge: 31427f70a14 18c3c0b4f6b Author: Continuous Integration <dev@code.org> Date: Mon May 26 07:41:53 2025 +0000 Merge remote-tracking branch 'origin/levelbuilder' into dts_candidate_2025-05-26 commit 31427f70a14c59804681038e2884c6d87736ccb5 Author: Continuous Integration <dev@code.org> Date: Mon May 26 07:30:26 2025 +0000 staging content changes (-robo-commit) commit 18c3c0b4f6bd0f017570dfb2f376a0602a79993d Author: Continuous Integration <dev@code.org> Date: Mon May 26 07:30:12 2025 +0000 levelbuilder content changes (-robo-commit) commit bf20eb432b738ad717e0fab3af344ac766481e88 Merge: ae11542de5a 6bce6d43717 Author: Dayne <dayne@code.org> Date: Fri May 23 17:57:55 2025 -0700 Merge pull request #66107 from code-dot-org/TEACH-1915/fix-unit-numbering Fixing modular Unit numbering on CourseOverview page commit 2168ff4c9a964fe21cd9c9c29dd478941f82334f Author: Mike Harvey <mike.harvey@code.org> Date: Fri May 23 20:16:04 2025 -0400 set workspace.options.disabled correctly commit 59822653d3f419812b7805cee34ff6765978da12 Author: Stephen Liang <538214+stephenliang@users.noreply.github.com> Date: Fri May 23 16:51:42 2025 -0700 fix(turbo): prevent turbocache from infinitely growing commit 166a943845e62d75370e6ffb181d4d73b0c9f8ff Merge: 83a1ea6f3de ecdcdc3aa2c Author: carl-codeorg <131809324+carl-codeorg@users.noreply.github.com> Date: Fri May 23 16:24:38 2025 -0700 Merge pull request #66110 from code-dot-org/dtl_candidate_3241cba6 DTL (Test > Levelbuilder: 3241cba6) commit ecdcdc3aa2c8da9178bf79125c670ea206b16523 Merge: 3241cba6dfd 83a1ea6f3de Author: carl-codeorg <131809324+carl-codeorg@users.noreply.github.com> Date: Fri May 23 16:22:56 2025 -0700 Merge branch 'levelbuilder' into dtl_candidate_3241cba6 commit 4a3511b88b5fa297d143342dc19808fc7442206c Author: Dayne <dayne@code.org> Date: Fri May 23 16:12:30 2025 -0700 Fix Unit title in Unit#summarize* methods commit ae11542de5aad7fc2f7f228006ecf3c7a00fb5af Merge: 4d6a35ef902 ba65447739f Author: Turner Riley <56283563+TurnerRiley@users.noreply.github.com> Date: Fri May 23 18:19:26 2025 -0400 Merge pull request #66105 from code-dot-org/add-time-to-flaky-regional-workshop-test Give flaky Regional Workshop Catalog frontend test more time to complete commit 6bce6d43717171dba30d0bd74208637ba72c216f Author: Dayne <dayne@code.org> Date: Fri May 23 15:16:55 2025 -0700 Fixing module Unit numbering on CourseOverview page commit ba65447739f68c6b722e8490fd461fc3c0a76f30 Author: Turner Riley <turner.riley@code.org> Date: Fri May 23 18:06:09 2025 -0400 add time to flaky regional workshop test commit 4d6a35ef90251ad39e626fd5d8fdc00d87b3238c Author: Brendan Reville <breville@users.noreply.github.com> Date: Fri May 23 15:05:46 2025 -0700 AI Tutor: Python Lab URL parameter (#66075) * AI Tutor: Python Lab URL parameter * Check before running an ask on run/validate commit d3ab6841750b4ce3bac240babc689635987f9ed3 Merge: b163d9821de 286514e7dab Author: Stephen Liang <stephenliang@users.noreply.github.com> Date: Fri May 23 15:03:00 2025 -0700 Merge pull request #66092 from code-dot-org/add-farsi-redirects Add farsi redirects commit b163d9821de69473dd592eb24ec0c6c8e77c9338 Merge: 15b974ae981 483c51cf37c Author: Molly Moen <molly@code.org> Date: Fri May 23 14:45:04 2025 -0700 Merge pull request #66068 from code-dot-org/molly/misc-python-theming Small python lab theming updates commit 105dc2fbfd6ba27b2e43882dea4c1903aa9c0a0c Merge: 3241cba6dfd 15b974ae981 Author: Code.org Deploy Systems <dev@code.org> Date: Fri May 23 11:20:18 2025 -1000 Merge pull request #66103 from code-dot-org/staging commit 15b974ae981fa8d057888198e8644ff3dff15acd Author: Eric Aderhold <eric.aderhold@code.org> Date: Fri May 23 14:19:06 2025 -0700 Add AI FAB to level pages, refactor chat API (#65860) * Add AI FAB to level pages, refactor chat API * Fix AiDiffChatTest * Don't show FAB when tutor is shown commit a62063276e2dc1859854a80dd25753acb2fe2c32 Merge: a7039d09106 b5c4913a5e0 Author: Turner Riley <56283563+TurnerRiley@users.noreply.github.com> Date: Fri May 23 17:14:25 2025 -0400 Merge pull request #66063 from code-dot-org/split-national-regional-workshops-on-catalog Split National/Regional workshop sections and add zip error message commit a7039d09106f888de2cca887dd7cf4d8175c211c Merge: beda94f2ad3 d73e474331d Author: Turner Riley <56283563+TurnerRiley@users.noreply.github.com> Date: Fri May 23 16:49:28 2025 -0400 Merge pull request #66028 from code-dot-org/regional-workshop-catalog-bug-bash-fixes Quick Regional Workshop Catalog bug bash feedback fixes commit beda94f2ad3b9ac8d8e0c576f36fb7002b2df8f5 Author: Sanchit Malhotra <85528507+sanchitmalhotra126@users.noreply.github.com> Date: Fri May 23 13:47:13 2025 -0700 AI Chat: fix starter assets upload dialog overlap (#65862) * AI Chat: fix starter assets upload dialog overlap * Include script levels controller fix commit 3818696162b0b3b6ad4b895b8c9db5b55a5e64de Author: Molly Moen <molly@code.org> Date: Fri May 23 13:34:50 2025 -0700 clean up commit 51234266e4f1851189be6cb6fa00a1dda051ba8a Author: Molly Moen <molly@code.org> Date: Fri May 23 13:30:45 2025 -0700 move data to lab2registry commit 483c51cf37c95509426a42c2b09f506994c530fb Author: Molly Moen <molly@code.org> Date: Fri May 23 13:14:06 2025 -0700 fix unit test commit 11552efd62a3f6675cc500cac0705f806b7f673a Author: Kaitie O <kaitie@code.org> Date: Fri May 23 15:06:29 2025 -0500 Re-enable Safari test (#65912) * Remove reference to teacher tool bar in test * added a test for on the unit page * add cookie * fix safari issue * fix safari issue commit e913a5aedae137d2c82175b6ebe64c5fb7af5747 Merge: 4b93f169045 740c37bb8da Author: Ryan Driscoll <ryan.driscoll@code.org> Date: Fri May 23 13:54:05 2025 -0600 Merge pull request #65993 from code-dot-org/ryan/school-association/fix/clear-bad-school-info fix(school association): prompt affected users to re-submit school info commit 3241cba6dfd0670abbcc36bf8c428fae0e7eab0f Merge: 568dbb7822e 4b93f169045 Author: Code.org Deploy Systems <dev@code.org> Date: Fri May 23 09:12:18 2025 -1000 Merge pull request #66098 from code-dot-org/staging commit b5c4913a5e0e0a1c0b7d146b27dcdaa816c61acb Merge: 2cb9246c55c d73e474331d Author: Turner Riley <turner.riley@code.org> Date: Fri May 23 14:47:35 2025 -0400 merge in staging commit d73e474331dc7e316886067322ab2b5a56d30a2a Author: Turner Riley <turner.riley@code.org> Date: Fri May 23 14:42:21 2025 -0400 move into function commit 2cb9246c55c2585f83fcce8afa4637ed580bf21a Author: Turner Riley <turner.riley@code.org> Date: Fri May 23 14:40:28 2025 -0400 move logic into function commit b85d85ad0dbd1f91527045fcc21cbc029ebb21b1 Merge: 9d1ff7230c1 242ac3063a7 Author: Turner Riley <turner.riley@code.org> Date: Fri May 23 14:18:54 2025 -0400 Merge branch 'regional-workshop-catalog-bug-bash-fixes' into split-national-regional-workshops-on-catalog commit 242ac3063a766ff0ded06f3084450713fcdd6548 Author: Turner Riley <turner.riley@code.org> Date: Fri May 23 14:16:57 2025 -0400 fix private method bug commit 4b93f169045dfdd880a616434d7f158ea2996657 Merge: 9be317d2485 059f936edb8 Author: Mike Harvey <43474485+mikeharv@users.noreply.github.com> Date: Fri May 23 14:13:43 2025 -0400 Merge pull request #66091 from code-dot-org/mike/trashcan-weight [Google Blockly] Fix trashcan weight commit 9d1ff7230c1bae7b946d9145ec1cccdd2a9e56ab Author: Turner Riley <turner.riley@code.org> Date: Fri May 23 14:08:58 2025 -0400 match timing behavior commit 73b0bfddd53867c288c32348e49c4f01df8c09e4 Merge: 97a8823a149 95a25c48206 Author: Turner Riley <56283563+TurnerRiley@users.noreply.github.com> Date: Fri May 23 14:07:08 2025 -0400 Merge branch 'regional-workshop-catalog-bug-bash-fixes' into split-national-regional-workshops-on-catalog commit 95a25c48206684e8e0a23f2fe53b4aeb65a8ea4d Author: Turner Riley <turner.riley@code.org> Date: Fri May 23 13:54:47 2025 -0400 convert start to workshop time zone or dont default to chicago commit 9be317d24859edb1094bd5d4d45c80366f1b52a1 Author: carl-codeorg <131809324+carl-codeorg@users.noreply.github.com> Date: Fri May 23 10:52:42 2025 -0700 skip gdpr test (#66094) commit 58047114b898a65936093c875db675ec70a7e9d8 Merge: e0993dca27b 59f598367c7 Author: Mike Harvey <43474485+mikeharv@users.noreply.github.com> Date: Fri May 23 13:47:07 2025 -0400 Merge pull request #66079 from code-dot-org/mike/select-event-early-return [Music] Early return for block selected events commit e0993dca27b05ed77c9617194f793d4e1a5fd18f Author: Kelby Hawn <9256643+kelbyhawn@users.noreply.github.com> Date: Fri May 23 10:41:35 2025 -0700 Remove or skip more Pegasus ui tests (#66090) * remove or skip pegasus ui tests * put homepage tests back commit 02ad86f4b6bf4129e6a0ac643818c3865723fd7a Merge: d085cbfeaa5 8be02aac788 Author: Turner Riley <turner.riley@code.org> Date: Fri May 23 13:31:15 2025 -0400 Merge branch 'staging' into regional-workshop-catalog-bug-bash-fixes commit 8be02aac7889a251ac3a5bdd734fd62b680376a4 Author: Artem Vavilov <artem.vavilov.7@gmail.com> Date: Fri May 23 20:14:16 2025 +0300 CMS-722: Fix flaky HeaderTest (#66088) commit 035bafb007d04adfd56e6de1bade04d0c9327ca8 Merge: 937824830e4 5a27e0568e6 Author: Mike Harvey <43474485+mikeharv@users.noreply.github.com> Date: Fri May 23 12:30:30 2025 -0400 Merge pull request #66080 from code-dot-org/mike/focus-outline [Google Blockly] No path outline for focused blocks commit 286514e7dabf308eb925a8da4d27fa33586a836d Author: Dani <dani@code.org> Date: Fri May 23 12:25:14 2025 -0400 Add farsi redirects commit 937824830e4a5629b6956dabb7a0ccd36a11608e Author: Cassi Brenci <cassi.brenci@code.org> Date: Fri May 23 09:17:59 2025 -0700 Lab2: Change white-space handling for instructions panel (#65834) commit 49f4495b1b0cfbca9e51bca31f794838bbae7387 Merge: 06d31f4e5c8 a8e9d0ef590 Author: Stephen Liang <stephenliang@users.noreply.github.com> Date: Fri May 23 09:04:07 2025 -0700 Merge pull request #66000 from code-dot-org/stephen/newrelic feat(newrelic): add new relic browser commit 059f936edb8e4bd1ca352c70c78e1b78ead687ef Author: Mike Harvey <mike.harvey@code.org> Date: Fri May 23 11:55:25 2025 -0400 [Google Blockly] Fix trashcan weight commit 06d31f4e5c8f1872152f73e03d2e33c20c5b257d Merge: d32fa09f28e ae61222fa23 Author: Dayne <dayne@code.org> Date: Fri May 23 08:32:23 2025 -0700 Merge pull request #66062 from code-dot-org/TEACH-1538/all-nested-urls-attempt-3 3rd attempt - Migrate /s/... URLs to /courses/.../units/... "nested URLs" commit 568dbb7822e1262f607937816337acbdd4755dfc Merge: 2fd09ffd975 d32fa09f28e Author: Code.org Deploy Systems <dev@code.org> Date: Fri May 23 05:26:18 2025 -1000 Merge pull request #66089 from code-dot-org/staging commit d32fa09f28e6e24312284ce4528a8f626c43a7ff Author: Kelby Hawn <9256643+kelbyhawn@users.noreply.github.com> Date: Fri May 23 08:24:12 2025 -0700 Update menu icons on Headers (#66030) * remove minus icon from ProjectsMenu.tsx * update expandable menus to use chevrons commit 223e13002c1091abcc8c516307b193b56eac9dc3 Author: Kelby Hawn <9256643+kelbyhawn@users.noreply.github.com> Date: Fri May 23 08:21:34 2025 -0700 feat(HeroBanner): add hideImageOnSmallScreen prop (#66055) * feat(HeroBanner): add hideImageOnSmallScreen prop * add to Contentful * clean up commit 404bd5fa7664b6dd133281c9ce4767bd13559ab2 Merge: e3afb0138f0 7ec0bee1673 Author: Stephen Liang <stephenliang@users.noreply.github.com> Date: Fri May 23 08:20:14 2025 -0700 Merge pull request #66086 from code-dot-org/stephen/fix-cache-time fix(cache): update cache time in view response function commit a8e9d0ef5906fc77f339c69f5b6608fd8c8cc776 Author: Stephen Liang <538214+stephenliang@users.noreply.github.com> Date: Fri May 23 08:17:57 2025 -0700 fix env var on marketing stack commit e3afb0138f02aa56dc97dd12851fd175b29e8830 Merge: b3567603f7a 0fdef8a2e1f Author: Stephen Liang <stephenliang@users.noreply.github.com> Date: Fri May 23 08:10:31 2025 -0700 Merge pull request #66084 from code-dot-org/dmcavoy-patch-3 Update next.config.ts commit b3567603f7adec2b29ecafa9d2594ba2cec30aca Merge: df526552848 b1849de9527 Author: Bethany Connor <46464143+bethanyaconnor@users.noreply.github.com> Date: Fri May 23 10:26:38 2025 -0400 Merge pull request #66056 from code-dot-org/bethany/update-aif-homepage-banner-link Update AIF homepage banner link commit 59f598367c78fd4771a6d5eba645fc97dd1ae9ab Merge: 0543fe28772 df526552848 Author: Mike Harvey <mike.harvey@code.org> Date: Fri May 23 10:02:53 2025 -0400 Merge branch 'staging' into mike/select-event-early-return commit 5a27e0568e6510d09dfd8403c3409d57e0458a03 Merge: 56a9385dd23 df526552848 Author: Mike Harvey <mike.harvey@code.org> Date: Fri May 23 10:02:37 2025 -0400 Merge branch 'staging' into mike/focus-outline commit df526552848471651f2abec573e7e2944f2966c3 Merge: 4c871c11ecd 96664e92604 Author: Mike Harvey <43474485+mikeharv@users.noreply.github.com> Date: Fri May 23 10:02:10 2025 -0400 Merge pull request #66087 from code-dot-org/mike/editor_type remove editor_type from programming environment files commit 96664e926049dd6f90583d250b1546f261c7604a Author: Mike Harvey <mike.harvey@code.org> Date: Fri May 23 09:55:36 2025 -0400 remove editor_type from programming environment files commit 7ec0bee167319c3f386bb766c2b883aaf76e8495 Author: Stephen Liang <538214+stephenliang@users.noreply.github.com> Date: Fri May 23 06:52:42 2025 -0700 fix(cache): update cache time in view response function commit 0fdef8a2e1f1caaaeaa8fe6630de10e5e87ee5ea Author: Dani LaMarca <dani@code.org> Date: Fri May 23 09:14:44 2025 -0400 Update next.config.ts commit 2fd09ffd975209a89c047bd22f57e403f2747c8c Merge: dd2e4763598 4c871c11ecd Author: Code.org Deploy Systems <dev@code.org> Date: Fri May 23 02:54:19 2025 -1000 Merge pull request #66082 from code-dot-org/staging commit 56a9385dd23a77f1696da282018ca2e8d9b11fe3 Author: Mike Harvey <mike.harvey@code.org> Date: Fri May 23 08:40:11 2025 -0400 [Google Blockly] No path outline for focused blocks commit 0543fe287727970b84e48348e9e2a3155ca4bb0b Author: Mike Harvey <mike.harvey@code.org> Date: Fri May 23 08:09:28 2025 -0400 [Music] Early return for block selected events commit 83a1ea6f3def356e793acd00cb2f7d2bda835ead Merge: 211e263395b 86780a894df Author: Code.org Deploy Systems <dev@code.org> Date: Thu May 22 23:25:36 2025 -1000 Merge pull request #66077 from code-dot-org/dtl_candidate_b37fdce6 commit 86780a894dfbec1cb929e3b05346843c1fac62eb Merge: 211e263395b b37fdce6889 Author: Continuous Integration <dev@code.org> Date: Fri May 23 09:20:25 2025 +0000 Merge commit 'b37fdce6' into dtl_candidate_b37fdce6 commit 4c871c11ecd8bc7eae40f37c1156475ee1519050 Merge: 7ee1804f06c 6f5cf98b3eb Author: Code.org Deploy Systems <dev@code.org> Date: Thu May 22 21:35:36 2025 -1000 Merge pull request #66076 from code-dot-org/dts_candidate_2025-05-23 DTS (Levelbuilder > Staging) [robo-dts] commit 6f5cf98b3ebb875d85e010dca32dc505fb139427 Merge: 7ee1804f06c 211e263395b Author: Continuous Integration <dev@code.org> Date: Fri May 23 07:35:27 2025 +0000 Merge remote-tracking branch 'origin/levelbuilder' into dts_candidate_2025-05-23 commit 7ee1804f06c72b5efac78957b38212168c26522f Author: Continuous Integration <dev@code.org> Date: Fri May 23 07:30:25 2025 +0000 staging content changes (-robo-commit) commit 211e263395b75e055b2cc8a353859fb3b7cfa96b Author: Continuous Integration <dev@code.org> Date: Fri May 23 07:30:12 2025 +0000 levelbuilder content changes (-robo-commit) commit ae61222fa23339e15945ebe2c6a019199518f6e7 Author: Dayne <dayne@code.org> Date: Thu May 22 23:46:39 2025 -0700 Add UnitGroupUnit#cached_unit_group and use it in Unit.summarize commit 48698ebdcef47e6fe3e3298b393d23b7e3541008 Merge: ecd48b17576 3863b3fde55 Author: levadadenys <levada.denys@gmail.com> Date: Fri May 23 08:59:03 2025 +0300 Merge pull request #66007 from code-dot-org/denys/cms/cms-696-2 [CMS-696] Create definitions to make action blocks work with videos commit ecd48b175769414cc29aedc12b15cb638df2a59a Merge: 84cca67c560 3e01badc6d9 Author: levadadenys <levada.denys@gmail.com> Date: Fri May 23 08:58:33 2025 +0300 Merge pull request #66047 from code-dot-org/denys/dsco/update-colors-1 DSCO Update colors commit 84cca67c560cb7f9e0c7cb979203808cdfc29cd0 Author: Hannah Bergam <hannahbergam@gmail.com> Date: Thu May 22 21:18:38 2025 -0700 Making WithTooltip update position dynamically (#65142) * progress toward dynamic overflow * so so much closer * feat(tooltip): implement direction flip when tooltip is positioned outside of screen * feat(tooltip): simplify tooltip position recalculation calls logic * feat(common): add 'none direction' to ComponentPlacementDirection * feat(tooltip): add 'none' direction option for tooltips * restore ensure tooltip stays within the viewport logic * feat(popover): ensure proper direction handling * minor update of NoneDirectionTooltip story position and description * lint fixes * fix failing drone * Fix(Tooltip): Add hideTail prop (#66052) * add noTail prop * change prop name, add story * remove !important, add story and unit tests * add comment for new prop --------- Co-authored-by: denyslevada <levada.denys@gmail.com> Co-authored-by: fisher-alice <107423305+fisher-alice@users.noreply.github.com> commit 318f380f80c02cbc7d07243cab4e1209ea20340f Merge: 2b2d919df9f c6df3831fdd Author: Stephen Liang <stephenliang@users.noreply.github.com> Date: Thu May 22 18:55:45 2025 -0700 Merge pull request #66074 from code-dot-org/dmcavoy-patch-2 Update next.config.ts commit 595fa6e2e3da9390de492a59e11adccf4b89cbfb Author: Dayne <dayne@code.org> Date: Thu May 22 18:12:58 2025 -0700 Fixing 'Go to Unit' links on CourseOverview page in teacher dashboard commit bd8e75d318d93ba9b241d8c10969f23188cde08a Author: Dayne <dayne@code.org> Date: Thu May 22 17:42:04 2025 -0700 Adding nested URL stupport for section select commit c6df3831fddde7bbb16ede4b48eaa8fcdb607deb Author: Dani LaMarca <dani@code.org> Date: Thu May 22 21:00:51 2025 -0400 Update next.config.ts commit 2b2d919df9f2bd511723a9f69ec9010f1503be31 Author: Artem Vavilov <artem.vavilov.7@gmail.com> Date: Fri May 23 03:42:58 2025 +0300 feat(marketing): add editorial cards to /all-the-things (#66016) CMS-593 commit 186ddcfae6cde3e5ec60e5edd27f98ea2fae73f7 Author: Brendan Reville <breville@users.noreply.github.com> Date: Thu May 22 17:13:29 2025 -0700 Music: enable play tune (#65972) * Music: tune enable * Add play tune to end of /s/music-jam-2024 * Report analytic on block usage * Loc button text & add analytic event * Update analytics event commit fd5b71539b169d2ec2207228c6c7528538cc699f Merge: 149c9b5f70e 8dca051fed6 Author: Mike Harvey <43474485+mikeharv@users.noreply.github.com> Date: Thu May 22 19:53:14 2025 -0400 Merge pull request #66070 from code-dot-org/sanchit/music-blockly-select Music: use addSelect/removeSelect to avoid recursion commit 97a8823a1490cfcb68f700a4e929b529d3181901 Author: Turner Riley <turner.riley@code.org> Date: Thu May 22 19:46:38 2025 -0400 fix time test commit dd2e4763598cfa69319196ef20002b5b886aea3e Merge: b37fdce6889 149c9b5f70e Author: Code.org Deploy Systems <dev@code.org> Date: Thu May 22 13:46:18 2025 -1000 Merge pull request #66071 from code-dot-org/staging commit 4edfb2899bdefc9280b1effe4498f461e13b2f8b Merge: ef6a80028cb d085cbfeaa5 Author: Turner Riley <turner.riley@code.org> Date: Thu May 22 19:45:25 2025 -0400 fix merge conflict commit 8dca051fed694eb151f3768f37dbfa19dc90eb30 Author: Sanchit Malhotra <sanchit@code.org> Date: Thu May 22 16:43:27 2025 -0700 Music: use addSelect/removeSelect to avoid recursion commit d085cbfeaa514798d0ce85cd2f770faec5ed698d Merge: cb1fa418b9e 149c9b5f70e Author: Turner Riley <turner.riley@code.org> Date: Thu May 22 19:28:22 2025 -0400 merge in staging commit cb1fa418b9e995f9b63a27d8cf5e06ef5d5f2016 Author: Turner Riley <turner.riley@code.org> Date: Thu May 22 19:27:10 2025 -0400 fix merge conflict commit 149c9b5f70ec89db9cd6bee53004a742b0b52ca7 Author: Kelby Hawn <9256643+kelbyhawn@users.noreply.github.com> Date: Thu May 22 15:39:38 2025 -0700 chore(marketing): update Tools heading in CurriculumSnapshot (#66059) * chore(marketing): update Tools heading in CurriculumSnapshot * fix failing test commit 861a019283bd85783166de63ee8a0b7ff2761be5 Author: Turner Riley <turner.riley@code.org> Date: Thu May 22 17:44:36 2025 -0400 adjust to timezone commit ef6a80028cb924277c84187fb83abc23e4344c6e Author: Turner Riley <turner.riley@code.org> Date: Thu May 22 17:32:11 2025 -0400 update frontend tests commit be474aa7b74564ce2cb0bec5ba05f49221160465 Author: Molly Moen <molly@code.org> Date: Thu May 22 14:21:39 2025 -0700 purple buttons in modal commit 04440443a9978485472149d08da631e8eb5885c7 Author: Dayne <dayne@code.org> Date: Thu May 22 13:36:51 2025 -0700 Query directly for the User rather than looping through all script_levels and querying each user commit c6d10e8a37f0747ec5a1e1ce93f8730309f7393a Author: Molly Moen <molly@code.org> Date: Thu May 22 14:19:03 2025 -0700 update picker to theme correctly commit b7a7c0f073255bc511d6567edc5f5d560de237b8 Author: Molly Moen <molly@code.org> Date: Thu May 22 14:10:46 2025 -0700 fix validate button color commit c1aec0966bf67e293f3937840d26fdc5ed1609ba Author: Molly Moen <molly@code.org> Date: Thu May 22 13:56:04 2025 -0700 undo changes to ProjectShare commit 3d7093e7fbdd2e6168ee27307ad27d2c39bf73de Author: Molly Moen <molly@code.org> Date: Thu May 22 13:52:22 2025 -0700 clean up and add comment commit 65f74c6d93909a5f811daf0d512a6e5c62319b3b Author: Dani LaMarca <dani@code.org> Date: Thu May 22 16:46:53 2025 -0400 Update next.config.ts (#66060) commit fe655d8579e98c36ebc4b5d519db576ed0f63344 Author: Turner Riley <turner.riley@code.org> Date: Thu May 22 16:43:43 2025 -0400 undo accidental change to course offerings controller commit b8c95e88ea5ddfa8c63e2f282c3137e1b373f717 Author: Turner Riley <turner.riley@code.org> Date: Thu May 22 16:43:13 2025 -0400 split sections commit 5648f7f37d02398485dea0794589e488afd6582b Author: Dayne <dayne@code.org> Date: Thu May 22 13:33:39 2025 -0700 Revert "Revert "2nd attempt - Migrate /s/... URLs to /courses/.../units/... "nested URLs""" This reverts commit f1d99d22ffa79524087a359915937d9720baf032. commit b37fdce68897eaab1ad06e49f967ae575f822949 Merge: f9f0b8d33c1 f097e69e803 Author: Code.org Deploy Systems <dev@code.org> Date: Thu May 22 10:30:19 2025 -1000 Merge pull request #66061 from code-dot-org/staging commit f097e69e8038ac7fe674910ea27db21824c2dca0 Merge: 455ad0935f1 725ebd89e80 Author: Stephen Liang <stephenliang@users.noreply.github.com> Date: Thu May 22 13:19:10 2025 -0700 Merge pull request #66051 from code-dot-org/stephen/cache-time feat(cache): reduce revalidate period to 15 min commit 6ec0f7db9b1e4cd5f2db4add5646c892408280d1 Author: Molly Moen <molly@code.org> Date: Thu May 22 13:09:33 2025 -0700 more clean up commit 19bd86bda3cccd983a0cb1085519dba0ee059821 Author: Molly Moen <molly@code.org> Date: Thu May 22 13:08:15 2025 -0700 simplify logic commit 455ad0935f14161cefff03b5eee8412a774562ff Author: Mark Barnes <mark.barnes@code.org> Date: Thu May 22 14:45:29 2025 -0500 Create section avatar edit component (#65926) * add avatar edit dialog * fix * update styling and add all elements * PR updates * update avatar select button text commit f89dd261a90ff4c1a35a1c3b12cca67b66eb5ea9 Author: carl-codeorg <131809324+carl-codeorg@users.noreply.github.com> Date: Thu May 22 12:43:55 2025 -0700 Remove Host header from marketing site origin cache behaviors (#65818) commit 3014459f026e2cf079cf6c9204696e2f2bf88147 Merge: 77dcd0b014b b008c9ba91d Author: Molly Moen <molly@code.org> Date: Thu May 22 12:42:16 2025 -0700 Merge pull request #66027 from code-dot-org/molly/update-workspace-header Python Lab: Update workspace header height commit 77dcd0b014b8e5e81fd6dead9d68d8e138e6fdcf Author: Artem Vavilov <artem.vavilov.7@gmail.com> Date: Thu May 22 22:31:33 2025 +0300 fix(EditorialCard): a11y issue (#66049) CMS-43 commit d942a1d12d32312025b32ee7ce2f2d14b1245225 Merge: 336c208c375 dcf29dcc226 Author: Mike Harvey <43474485+mikeharv@users.noreply.github.com> Date: Thu May 22 15:28:34 2025 -0400 Merge pull request #64776 from code-dot-org/hbergam/blockly-v12 Blockly v12 Release commit 336c208c3750a38a89e35815c440f464444cecd5 Merge: 5a3011925c8 f1d99d22ffa Author: Dayne <dayne@code.org> Date: Thu May 22 12:21:57 2025 -0700 Merge pull request #66058 from code-dot-org/revert-66037-TEACH-1538/all-nested-urls-attempt-2 Revert "2nd attempt - Migrate /s/... URLs to /courses/.../units/... "nested URLs"" commit f1d99d22ffa79524087a359915937d9720baf032 Author: Dayne <dayne@code.org> Date: Thu May 22 12:21:23 2025 -0700 Revert "2nd attempt - Migrate /s/... URLs to /courses/.../units/... "nested URLs"" commit 5a3011925c8c33e6eb41c4ad5e38f8881c72357a Author: Elijah Hamovitz <elijahhamovitz@gmail.com> Date: Thu May 22 12:08:17 2025 -0700 Gzip Cached Drone Artifacts (#65936) * gzip all drone artifacts * temporarily update clone cache in this branch, so I can test without merging into actual staging * Fix yml * continue to try to figure out how drone syntax works * Revert temp changes Revert "continue to try to figure out how drone syntax works" This reverts commit ad2b2b53f37a1211deb75ec24a2f26b115f73ef1. Revert "Fix yml" This reverts commit 5295c0308531052fcfa953dd9ee2b755cefbb156. Revert "temporarily update clone cache in this branch, so I can test without merging into actual staging" This reverts commit 31250572794af219640c81ca6d123095990eea86. * temporarily revert all changes to test timing * Revert "temporarily revert all changes to test timing" This reverts commit a511c191a8829d4806fd3ea389e987a8fd915037. * resign drone.yml after updates * update drone signature after merge commit 977dd077a752f2af2744c767082106210223771f Author: Artem Vavilov <artem.vavilov.7@gmail.com> Date: Thu May 22 22:05:01 2025 +0300 CMS-722: Move Hamburger menu UI test to Header integration tests (#66026) commit 3863b3fde554f1896f3c7003ea1c7ad7ee46acf1 Merge: 57dd1a2d9e1 8ac10cbe370 Author: denyslevada <levada.denys@gmail.com> Date: Thu May 22 21:41:44 2025 +0300 Merge remote-tracking branch 'origin/staging' into denys/cms/cms-696-2 # Conflicts: # frontend/apps/marketing/src/components/contentful/actionBlocks/defaultActionBlock/ActionBlock.tsx # frontend/apps/marketing/src/components/contentful/actionBlocks/fullWidthActionBlock/FullWidthActionBlock.tsx commit 8ac10cbe370b0e44e26065bf638d63ec2739307b Author: Brendan Reville <breville@users.noreply.github.com> Date: Thu May 22 11:31:28 2025 -0700 Music: tune sharp symbol (#66040) commit 3e01badc6d915f5859277996451ee189fcb727ec Merge: eaa564b4822 bd84d2d2d66 Author: denyslevada <levada.denys@gmail.com> Date: Thu May 22 21:30:56 2025 +0300 Merge remote-tracking branch 'origin/staging' into denys/dsco/update-colors-1 commit 9eaa3c06ecbdc61d988339ab430b42bd15e0f579 Author: Kelby Hawn <9256643+kelbyhawn@users.noreply.github.com> Date: Thu May 22 11:24:25 2025 -0700 fix(marketing): allows Video and ActionBlock components to be hidden (#66045) commit 57dd1a2d9e1048e5843c581c7c1f449872947b7c Merge: 065922c37ad bd84d2d2d66 Author: denyslevada <levada.denys@gmail.com> Date: Thu May 22 21:23:18 2025 +0300 Merge remote-tracking branch 'origin/staging' into denys/cms/cms-696-2 commit bd84d2d2d66391aefd182f02856a12bba51034e4 Merge: b2f97fbbf6b 703b411c801 Author: Dayne <dayne@code.org> Date: Thu May 22 11:17:12 2025 -0700 Merge pull request #66041 from code-dot-org/TEACH-1538/temporarily-remove-permanent-redirect Temporarily disable permanent redirect for level URLs commit b1849de95273f27e94a64c47bb814661328dd621 Author: Bethany Connor <46464143+bethanyaconnor@users.noreply.github.com> Date: Thu May 22 14:16:27 2025 -0400 Update AIF homepage banner link commit b2f97fbbf6bd9da0076d8b559bb01a8bc9d99177 Merge: 52fd9bd52df 2cc9256c330 Author: wilkie <david.wilkinson@code.org> Date: Thu May 22 14:06:43 2025 -0400 Merge pull request #66035 from code-dot-org/i18n-sync-down-out-05-21-2025 I18n sync Down & Out 05/21 commit 73c82ed396cc2d763a7a17669cebee54c49b165c Author: Molly Moen <molly@code.org> Date: Thu May 22 11:01:47 2025 -0700 put theme in header commit 52fd9bd52df69b8a4eca33d3e8d4ff5bd6e22bbe Author: Brendan Reville <breville@users.noreply.github.com> Date: Thu May 22 10:53:04 2025 -0700 Music: absolute tune notes (#66025) commit f9f0b8d33c1363c0a133986c4c28d3e4d0a51057 Merge: 5331be68e7c 73a7e4e31d0 Author: Code.org Deploy Systems <dev@code.org> Date: Thu May 22 07:48:19 2025 -1000 Merge pull request #66054 from code-dot-org/staging commit 065922c37ad30b65bac41528a98a59c55028d0fb Author: denyslevada <levada.denys@gmail.com> Date: Thu May 22 20:45:34 2025 +0300 feat(actionBlocks): hide download video button commit 73a7e4e31d0955d2b0c0a6344dde08396596ceb2 Author: bencodeorg <ben@code.org> Date: Thu May 22 10:43:30 2025 -0700 Skip failing eyes test (#66053) commit 725ebd89e8053af15d3aff6424c0fd00c9abeaa2 Author: Stephen Liang <538214+stephenliang@users.noreply.github.com> Date: Thu May 22 10:37:07 2025 -0700 feat(cache): reduce revalidate period to 15 min This PR reduces the revalidate period to 15 mins for which a page is considered "fresh" to the upstream requester. The Code.org infrastructure currently has two upstream caches in a sequential chain: 1. Marketing CDN 2. Code.org front door CDN (targeted to be removed in the future) When this revalidate parameter is sent, it can take a total of [revalidate] * [number of upstream chains+1] seconds With the current value being 15 minutes, it can therefore take [900] * [2 + 1] = 45 minutes for a page to be updated. commit c96c393b3074b11e29af180fe311efed51975313 Merge: e413aff889b d75e7353be5 Author: Ryan Driscoll <ryan.driscoll@code.org> Date: Thu May 22 11:35:08 2025 -0600 Merge pull request #66013 from code-dot-org/ryan/workshops/fix/repair-custom-dropdown-layout-after-dsco-change fix(workshops): repair custom dropdown layout after dsco change commit e413aff889bf34000023675281ab30cd7338a851 Merge: df11a79c9e0 4a80d0baf36 Author: Ryan Driscoll <ryan.driscoll@code.org> Date: Thu May 22 11:34:51 2025 -0600 Merge pull request #65916 from code-dot-org/ryan/workshops/chore/clean-up-from-workshop-refactor-launch chore(workshops): clean up from workshop refactor launch commit 1d893c4c104542f637232cc7384d3223f20f44f7 Author: Stephen Liang <538214+stephenliang@users.noreply.github.com> Date: Thu May 22 08:48:07 2025 -0700 bypass error in console for favicon commit baa58538b72b4021f0380e476120be47c556be3d Author: Stephen Liang <538214+stephenliang@users.noreply.github.com> Date: Thu May 22 07:24:18 2025 -0700 Ensure 404 page has a title and update images commit efe63605c545233ba3466700f675d9ef6fd7966f Author: Stephen Liang <stephenliang@users.noreply.github.com> Date: Wed May 21 15:08:48 2025 -0700 Update frontend/apps/marketing/src/components/error/Error.tsx Co-authored-by: Kelby Hawn <9256643+kelbyhawn@users.noreply.github.com> commit 11b1f0e95bf3f987e92030f62c24d02717f8f47f Author: Stephen Liang <stephenliang@users.noreply.github.com> Date: Wed May 21 15:08:30 2025 -0700 Update frontend/apps/marketing/src/components/error/error.module.scss Co-authored-by: Kelby Hawn <9256643+kelbyhawn@users.noreply.github.com> commit 02d7e2e300d8d53025170a6c5d24994c9f456330 Author: Stephen Liang <538214+stephenliang@users.noreply.github.com> Date: Wed May 21 10:50:31 2025 -0700 feat(errors): add error boundary commit 580183b7fdffced6c5a8d6e031345a8235be8bea Author: Stephen Liang <538214+stephenliang@users.noreply.github.com> Date: Tue May 20 15:39:43 2025 -0700 feat(newrelic): add new relic browser This PR instruments the browser application with new relic's browser instrumentation. commit e68b4f7343a12806649e73f6880075f4050d1ec4 Author: Turner Riley <turner.riley@code.org> Date: Thu May 22 13:21:55 2025 -0400 clear url param after each test commit df11a79c9e07d1f6af0805608e787c1fc1e67033 Author: Continuous Integration <dev@code.org> Date: Thu May 22 17:01:16 2025 +0000 update trusted proxy list for cloudfront servers commit eaa564b4822b75f744db6de81cd917875c303575 Author: denyslevada <levada.denys@gmail.com> Date: Thu May 22 19:33:45 2025 +0300 feat(colors): update colors.scss commit d6430b1466008cee0b2133ddc3a48e3f62a56db7 Author: denyslevada <levada.denys@gmail.com> Date: Thu May 22 19:31:52 2025 +0300 feat(primitiveColors): update primitiveColors.scss commit 740c37bb8da89873a68e1ad618628264784db759 Author: Ryan Driscoll <driscollrp@gmail.com> Date: Thu May 22 09:59:42 2025 -0600 feat: add guard to query to ensure the user exists and is a teacher commit fd7da1910a045d8d2ce97baf3c10bcf7330de9eb Author: Ryan Driscoll <driscollrp@gmail.com> Date: Wed May 21 14:54:48 2025 -0600 fix: ensure local variable is set for other renderings of the school info interstitial partial commit ee53ccb8246b5d7f86536933da5ea18d742cd37d Author: Ryan Driscoll <driscollrp@gmail.com> Date: Wed May 21 09:57:39 2025 -0600 refactor: still fetch the user's existing school info so we can pre-fill their zip code and fetch the nces schools immediately commit 609edeee5bd5300ed261a50c8c29e26753814f8f Author: Ryan Driscoll <driscollrp@gmail.com> Date: Wed May 21 08:53:15 2025 -0600 refactor: remove unnecessary callback pattern and just return the promise to error can be handled commit 5176b5ee2b1ca5e761f20199b75ba06583db31ca Author: Ryan Driscoll <driscollrp@gmail.com> Date: Tue May 20 15:41:04 2025 -0600 feat: use temporary affectedByMissingSchoolData variable to conditionally handle affected users' need to update their school info commit a64327927806ffd2bebdba5c9a9fab8bb6f402fa Author: Ryan Driscoll <driscollrp@gmail.com> Date: Tue May 20 15:34:20 2025 -0600 feat: determine which users were affected by the nces school data outage and show them the school info interstitial, passing script data prop commit c36ef0cb28799213de1cf58a6e8390f6566efd98 Author: Ryan Driscoll <driscollrp@gmail.com> Date: Tue May 20 15:20:57 2025 -0600 chore: remove unused local variables commit 6ace7e10e4f640e1b88c8e1b124c35fc60961716 Author: Ryan Driscoll <driscollrp@gmail.com> Date: Tue May 20 15:17:55 2025 -0600 feat: add loading state to schools list dropdown commit 39d4a2c748aec8223b42c80623fa889a350600ad Author: Turner Riley <turner.riley@code.org> Date: Thu May 22 11:43:30 2025 -0400 pr feedback commit 7f0f87d5fc82323f52796bddd4e4eac1712487af Merge: edc51821eca aa14747f7c0 Author: Stephen Liang <stephenliang@users.noreply.github.com> Date: Thu May 22 06:39:02 2025 -0700 Merge pull request #65983 from code-dot-org/stephen/vercel-otel feat(otel): add nodejs backend otel instrumenetation commit aa14747f7c08166ecd7693a4404c6b08147344f2 Author: Stephen Liang <538214+stephenliang@users.noreply.github.com> Date: Tue May 20 15:41:35 2025 -0700 change instrumentation env var to be more generic commit 3c6381999e5bf3e59d0ec7d439ea0f3223458756 Author: Stephen Liang <538214+stephenliang@users.noreply.github.com> Date: Thu May 8 16:31:45 2025 -0700 feat(otel): add nodejs backend otel instrumenetation This PR adds the ability to collect the Next.js opentelemetry built-in instrumentation and also our own custom instrumentation and emit to an arbitrary otel collector (new relic in our case). To accomplish this, the following instrumentations were added: 1. Node.js auto instrumentation a. Pino auto instrumentation (for structured logs) 2. OTEL log exports (via pino) 3. OTEL trace exports Additionally, some custom filters were added to prevent some noisy traces which would run up our data costs on New Relic. commit edc51821eca18ea99064333d5b5f36e593049f22 Merge: d12db20861a edc7927d887 Author: Stephen Liang <stephenliang@users.noreply.github.com> Date: Thu May 22 05:31:42 2025 -0700 Merge pull request #66036 from code-dot-org/stephen/fix-content-editor-tools fix(tools): update to use dynamic path slug commit ebe08603b481645229568a71403806d027ee909d Merge: 21e5a51dc8a 49e121ddaa9 Author: Code.org Deploy Systems <dev@code.org> Date: Wed May 21 23:25:29 2025 -1000 Merge pull request #66043 from code-dot-org/dtl_candidate_0e62455c commit 49e121ddaa9c9bb3f3724bbd80a1121c18698c0f Merge: 21e5a51dc8a 0e62455ceef Author: Continuous Integration <dev@code.org> Date: Thu May 22 09:20:21 2025 +0000 Merge commit '0e62455c' into dtl_candidate_0e62455c commit d12db20861a4b571e1cafbf343096aaf413d09aa Merge: 52afe771791 5d74071af3c Author: Code.org Deploy Systems <dev@code.org> Date: Wed May 21 21:35:33 2025 -1000 Merge pull request #66042 from code-dot-org/dts_candidate_2025-05-22 DTS (Levelbuilder > Staging) [robo-dts] commit 5d74071af3c4393f7b150f1d46998d62e6373893 Merge: 52afe771791 21e5a51dc8a Author: Continuous Integration <dev@code.org> Date: Thu May 22 07:35:25 2025 +0000 Merge remote-tracking branch 'origin/levelbuilder' into dts_candidate_2025-05-22 commit 52afe77179125f73259f869bb81bbaaf64c46394 Author: Continuous Integration <dev@code.org> Date: Thu May 22 07:30:25 2025 +0000 staging content changes (-robo-commit) commit 21e5a51dc8adb479e3d1a67f30a386d71f09c220 Author: Continuous Integration <dev@code.org> Date: Thu May 22 07:30:12 2025 +0000 levelbuilder content changes (-robo-commit) commit 703b411c801d3117169420ffd1fc8b5d750e6e72 Author: Dayne <dayne@code.org> Date: Wed May 21 23:08:26 2025 -0700 Temporarily disable permanent redirect for Units URLs commit 528a516299db369d9678c1c0155c51b4d3b45efd Merge: 71e1222d821 700981905b6 Author: Dayne <dayne@code.org> Date: Wed May 21 20:38:54 2025 -0700 Merge pull request #66037 from code-dot-org/TEACH-1538/all-nested-urls-attempt-2 2nd attempt - Migrate /s/... URLs to /courses/.../units/... "nested URLs" commit 5331be68e7cf553a60b5c5ba6992de723c31dee5 Merge: 0e62455ceef 71e1222d821 Author: Code.org Deploy Systems <dev@code.org> Date: Wed May 21 16:50:18 2025 -1000 Merge pull request #66038 from code-dot-org/staging commit 71e1222d82146c0933948fd3eb3ff702cf78c8de Author: Brendan Reville <breville@users.noreply.github.com> Date: Wed May 21 18:24:24 2025 -0700 AI Tutor: initial Python Lab integration * AI Tutor: Python Lab (WIP) * Updates * Use chat component * Change model * More context * Support for user questions * Updates * Updates * Log usage * Level property to show tutor * AiTutor -> AiTutor2 * Missed files * Fix logging * Clear hint response when level changed * Updates * Handle no validations * Recreate AITutorManager on level change * AITutor2UI -> AITutor2Chat & AITutor2Response * Responsive layout for chat * useAiTutor2 Hook (#65997) * useAiTutor2 Hook * Remove AiTutor2Response * Add type * Fix text styling * Fix styling * Fix unit test * Update function name --------- Co-authored-by: Sanchit Malhotra <85528507+sanchitmalhotra126@users.noreply.github.com> commit 89cea1b49684e75253e48f3e9b90c10b32bf0b5f Merge: b1a2066daa4 c37ab29134a Author: wilkie <david.wilkinson@code.org> Date: Wed May 21 19:56:57 2025 -0400 Merge pull request #66020 from code-dot-org/i18n-sync-in-up-05-21-2025 I18n sync In & Up 05/21 commit f6c0b1a2ffac238cbb5f3e5adec52cf97625b82b Author: Molly Moen <molly@code.org> Date: Wed May 21 16:08:32 2025 -0700 make afe dialog readable commit 34075ee45d5a2bc3be8507e7c4cc50e076ed84d1 Author: Molly Moen <molly@code.org> Date: Wed May 21 15:48:35 2025 -0700 work in progress commit 700981905b6e9a1cdd40ac5a2d646373d4bbddec Author: Dayne <dayne@code.org> Date: Wed May 21 15:44:45 2025 -0700 Removed Experiment usage for 'modularity'. Use only DCDO commit 98784b9c5e000e5ddacda450c56c8d6d78988e7d Author: Dayne <dayne@code.org> Date: Wed May 21 15:47:18 2025 -0700 Revert "Revert "Migrate /s/... URLs to /courses/.../units/... "nested URLs". (#65034)" (#66033)" This reverts commit b1a2066daa42152f76cca0b3e6a667fa02b9e690. commit edc7927d887eaa31f916959f6b35fa201b3baa8e Author: Stephen Liang <stephenliang@users.noreply.github.com> Date: Wed May 21 15:47:02 2025 -0700 Update frontend/apps/marketing/src/components/contentEditorHelper/Tools/Tools.tsx commit b353f8013aaffe1272694fb9c24b9cc5caeffc4d Author: Stephen Liang <538214+stephenliang@users.noreply.github.com> Date: Wed May 21 15:30:22 2025 -0700 fix(tools): update to use dynamic path slug The page path slug was changed to be multi-directory, update the tool to join those slugs. commit 2cc9256c330371688adbf71f3b56a67a4a258b67 Author: Continuous Integration <dev@code.org> Date: Wed May 21 21:57:44 2025 +0000 hoc i18n updates commit b1ca0de13819aa09ef6b8f2724a75d3796bbdc93 Author: Continuous Integration <dev@code.org> Date: Wed May 21 21:56:54 2025 +0000 apps i18n updates commit 3b31857b1a207b7efa1789b604ecaf5415874b2b Author: Continuous Integration <dev@code.org> Date: Wed May 21 21:56:16 2025 +0000 dashboard i18n updates - Chinese Traditional commit a7a559e3eaba29a4d26e18230f94fdef843e2d70 Author: Continuous Integration <dev@code.org> Date: Wed May 21 21:55:58 2025 +0000 dashboard i18n updates - Chinese Simplified commit dde53082c6d760e2aaa0598ee5ed58068ef0cebc Author: Continuous Integration <dev@code.org> Date: Wed May 21 21:55:41 2025 +0000 dashboard i18n updates - Vietnamese commit 693e6e698c3e853ce90cc7763c1567fb1f30f69c Author: Continuous Integration <dev@code.org> Date: Wed May 21 21:55:22 2025 +0000 dashboard i18n updates - Uzbek commit bb77e5a28b4b0baf25b2153615e2adf626b1ec46 Author: Continuous Integration <dev@code.org> Date: Wed May 21 21:55:04 2025 +0000 dashboard i18n updates - Urdu (Pakistan) commit 5cc3e60c9e9b8431d9b787b81a88e274643d83bf Author: Continuous Integration <dev@code.org> Date: Wed May 21 21:54:46 2025 +0000 dashboard i18n updates - Ukrainian commit e850366aa86e4623e58acbe5512458ac1bcb33c0 Author: Continuous Integration <dev@code.org> Date: Wed May 21 21:54:28 2025 +0000 dashboard i18n updates - Turkish commit 3aba2654d6252afc19f6b26147dc8b7b78c8b771 Author: Continuous Integration <dev@code.org> Date: Wed May 21 21:54:09 2025 +0000 dashboard i18n updates - Thai commit 7ffa6095dc5a398e74ec34306740124496edea2c Author: Continuous Integration <dev@code.org> Date: Wed May 21 21:53:36 2025 +0000 dashboard i18n updates - Telugu commit 2854c2b294648ecbec66564610852607b23095ac Author: Continuous Integration <dev@code.org> Date: Wed May 21 21:53:18 2025 +0000 dashboard i18n updates - Tamil commit 051a67684d39e747b13ae5f62300b1359443de82 Author: Continuous Integration <dev@code.org> Date: Wed May 21 21:53:00 2025 +0000 dashboard i18n updates - Swedish commit d2affbee6978f5bdc5a9bafe2fbc6f76c3ac300c Author: Continuous Integration <dev@code.org> Date: Wed May 21 21:52:42 2025 +0000 dashboard i18n updates - Serbian (Cyrillic) commit e3240da89aeaf3b60e2419bf85096a1bb9233f25 Author: Continuous Integration <dev@code.org> Date: Wed May 21 21:52:24 2025 +0000 dashboard i18n updates - Albanian commit 0e62455ceeffb501b5acfec430cdc7f83329fbe2 Merge: ba1def92cdb b1a2066daa4 Author: Code.org Deploy Systems <dev@code.org> Date: Wed May 21 11:52:19 2025 -1000 Merge pull request #66034 from code-dot-org/staging commit 0bc92df9baa5e9c335e4616048819cd093feeec2 Author: Continuous Integration <dev@code.org> Date: Wed May 21 21:52:06 2025 +0000 dashboard i18n updates - Slovenian commit 2ef4f41a8c154d18f0d178c8868093d23dfb2ad1 Author: Continuous Integration <dev@code.org> Date: Wed May 21 21:51:48 2025 +0000 dashboard i18n updates - Slovak commit 046dc1fc72dda3e2d42465679dc1ead16d3e1dde Author: Continuous Integration <dev@code.org> Date: Wed May 21 21:51:30 2025 +0000 …

molly-moen added 7 commits May 21, 2025 15:48

work in progress

34075ee

make afe dialog readable

f6c0b1a

put theme in header

73c82ed

simplify logic

19bd86b

more clean up

6ec0f7d

clean up and add comment

3d7093e

undo changes to ProjectShare

c1aec09

molly-moen marked this pull request as ready for review May 22, 2025 21:03

molly-moen requested review from a team, breville, fisher-alice and sanchitmalhotra126 May 22, 2025 21:03

sanchitmalhotra126 reviewed May 23, 2025

View reviewed changes

fisher-alice approved these changes May 23, 2025

View reviewed changes

molly-moen added 2 commits May 23, 2025 13:30

move data to lab2registry

5123426

clean up

3818696

sanchitmalhotra126 approved these changes May 23, 2025

View reviewed changes

molly-moen merged commit 3039269 into staging May 27, 2025
6 checks passed

molly-moen deleted the molly/theme-share-modal branch May 27, 2025 15:40

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Theme the lab2 share modal #66064

Theme the lab2 share modal #66064

Uh oh!

molly-moen commented May 22, 2025

Uh oh!

sanchitmalhotra126 May 23, 2025

Uh oh!

fisher-alice May 23, 2025

Uh oh!

molly-moen May 23, 2025

Uh oh!

sanchitmalhotra126 May 23, 2025

Uh oh!

molly-moen May 23, 2025

Uh oh!

molly-moen May 23, 2025

Uh oh!

fisher-alice left a comment

Uh oh!

sanchitmalhotra126 left a comment

Uh oh!

fisher-alice commented May 23, 2025

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

Theme the lab2 share modal #66064

Theme the lab2 share modal #66064

Uh oh!

Conversation

molly-moen commented May 22, 2025

Before

After

Dark Mode

Light Mode

Links

Testing story

PR Checklist:

Uh oh!

sanchitmalhotra126 May 23, 2025

Choose a reason for hiding this comment

Uh oh!

fisher-alice May 23, 2025

Choose a reason for hiding this comment

Uh oh!

molly-moen May 23, 2025

Choose a reason for hiding this comment

Uh oh!

sanchitmalhotra126 May 23, 2025

Choose a reason for hiding this comment

Uh oh!

molly-moen May 23, 2025

Choose a reason for hiding this comment

Uh oh!

molly-moen May 23, 2025

Choose a reason for hiding this comment

Uh oh!

fisher-alice left a comment

Choose a reason for hiding this comment

Uh oh!

sanchitmalhotra126 left a comment

Choose a reason for hiding this comment

Uh oh!

fisher-alice commented May 23, 2025

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants