Skip to content

DTL (Test > Levelbuilder): 4c5bff10#72146

Merged
deploy-code-org merged 23 commits into
levelbuilderfrom
dtl_candidate_4c5bff10
Apr 15, 2026
Merged

DTL (Test > Levelbuilder): 4c5bff10#72146
deploy-code-org merged 23 commits into
levelbuilderfrom
dtl_candidate_4c5bff10

Conversation

@deploy-code-org
Copy link
Copy Markdown
Contributor

No description provided.

hannahbergam and others added 23 commits April 13, 2026 12:59
…rary (#71959)

* Replace primitive colors with semantic tokens in SegmentedButtons

Migrate segmentedButtons.module.scss from primitive color variables
(--brand-teal-65) to semantic color tokens (--background-brand-teal-primary,
--background-brand-teal-extra-light, --borders-brand-teal-light) to support
theming and improve design system consistency.

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>

* Replace primitive colors with semantic tokens in Dialog

Migrate dialog.module.scss from primitive color variables
(--brand-teal-50, --neutral-base-white) to semantic color tokens
(--background-brand-teal-primary, --background-neutral-primary)
to support theming and improve design system consistency.

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>

* Replace primitive colors with semantic tokens in Video

Migrate video.module.scss from primitive color variables
(--neutral-base-white, --brand-purple-50) to semantic color tokens
(--background-neutral-primary, --background-brand-purple-primary)
to support theming and improve design system consistency.

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>

* Replace primitive colors with semantic tokens in CloseButton

Migrate closeButton.module.scss from primitive color variables
(--brand-teal-50, --neutral-gray-40, --neutral-gray-60) to semantic
color tokens (--borders-brand-teal-primary, --text-neutral-placeholder,
--text-neutral-quaternary) to support theming and improve design system
consistency.

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>

* Replace primitive colors with semantic tokens in Popover

Migrate popover.module.scss from primitive color variables
(--neutral-base-white, --brand-purple-50) to semantic color tokens
(--background-neutral-primary, --text-brand-purple-primary) to support
theming and improve design system consistency. Arrow border-colors
updated to match the popover background token.

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>

* local wip

* update primitiveColors.css

* update colors.css

* Revert "local wip"

This reverts commit 06141fe.

---------

Co-authored-by: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
* No filter applied if we are in general context with no sections assigned

* Update tests for new filter behavior
* Change model to sonnet 4 with correct inference profile

* Add permission for sonnet 4 w/ inference profile

* Remove old claude model from cloud formation permission to test adhoc

* Add getInferenceProfile to permission

* Add invoke model permission for foundation model

* invokemodel for all regions

* Missed a merge conflict

* Update to claude sonnet 4.5

* Updates tests with new model arn

* Fix model ARN variables

* Do string interpolation

* Get account and region for ec2 or local configuration

* Simplify region and account functions
Replace Statsig A/B test (select_grades_taught_on_account_creation) with
a DCDO flag (launch-grades-in-sign-up). Store selected grades in
User#properties as grades_teaching on account creation.

Co-authored-by: Claude Sonnet 4.6 <noreply@anthropic.com>
* Reduce Drone Unit Test Parallelization

We've been getting some persistent OOM errors when running Dashboard
unit tests in drone; reducing parallelization to accommodate.

* let's knock it all the way down to 5 for safety
…e DSCO Button with Mui Button in component-library and affected apps/ ussages (#71642)

* feat: replace custom Button components with MUI Button across multiple files

* chore: update @mui/material and related dependencies to version 7.3.5

* feat: replace button text props with children for consistency and update icon usage

* feat: replace button text props with children for consistency and update icon usage

* feat: replace button text props with children for consistency across story files

* feat: apply MUI ThemeProvider decorator by default for all stories

* feat: update CustomDropdown and ActionDropdown to use MUI Button and IconButton components

* feat: update ActionDropdown and related components to use MUI Button and IconButton with consistent props

* feat: update Slider story to use FontAwesomeV6Icon for button children and aria-labels

* feat: update button props in dialogs and dropdowns to use children instead of text for consistency

* feat: refactor UploadButton to use MUI Button and IconButton with updated props

* Fix test failures from DSCO Button -> MUI Button migration

- Carousel story: use `children` instead of `text` for button props
- Video: use `variant="contained"` for cookie consent button (a11y contrast)
- ActionBlock/FullWidthActionBlock tests: `text` -> `children`, `ariaLabel` -> `aria-label`
- HeroBanner test: update type import and button props for MUI
- Modal/Dialog tests: `text` -> `children` in button props
- ActionDropdown test: replace DSCO-specific `isIconOnly`/`icon` with MUI-compatible props

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>

* Fix prettier formatting and ActionDropdown aria-label regression

- Modal test: fix prettier formatting (line too long)
- CustomDropdown: restore labelText as aria-label fallback for icon
  button triggers (lost during DSCO -> MUI migration)
- ActionDropdown test: use FontAwesomeV6Icon children for trigger button

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>

* Wrap CheckboxDropdown button text in span for UI test compatibility

The old DSCO Button rendered text inside a <span>, but MUI Button
renders children as direct text nodes. UI tests use jQuery
span:contains() selectors to find "Select all" / "Clear all" text.

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>

* Update UI test selectors for MUI Button migration in CheckboxDropdown

MUI Button renders text as direct text nodes instead of wrapping in
<span> like the old DSCO Button. Update selectors from
span:contains(Select all) to button:contains(Select all) and same
for Clear all.

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>

* Fix prettier formatting in ActionDropdown test

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>

* Fix ActionDropdown disabled test for MUI pointer-events: none

MUI's disabled IconButton sets pointer-events: none, which causes
userEvent.click() to throw. Use pointerEventsCheck: 0 to bypass
since we're testing that clicks don't propagate when disabled.

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>

* lint fix

* fix: use prop('onClick') instead of simulate('click') in DeleteVocabularyDialogTest

Enzyme's simulate('click') crashes with MUI Button in React 18 due to
getInstanceFromNode incompatibility. Invoke onClick directly instead.

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>

* refactor: migrate Button, GenericButton, and LinkButton stories to MUI

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>

* docs: update migration status for Button inside-out replacement (PR #71642)

Mark all 8 Button internal DSCO consumers as done and add deprecation
notice to Button README now that all consumers are migrated.

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>

* refactor: replace ComponentLibraryButtonProps with native MUI ButtonProps

Delete muiButtonProps.ts and replace all usages of
ComponentLibraryButtonProps/ComponentLibraryIconButtonProps with native
MUI ButtonProps/IconButtonProps (aliased as MuiButtonProps/MuiIconButtonProps).

Now that @mui/material is a peerDependency (#71818), both apps/ and
component-library resolve to the same MUI copy, making the custom
wrapper types unnecessary.

Also adds target/rel to Button type augmentation in apps/src/types/mui.d.ts
and corrects docs that incorrectly stated type augmentations propagate
across package boundaries.

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>

* fix: remove restricted DSCO Button import from UploadButton

Replace the deprecated @code-dot-org/component-library/button import
with inferred types. Also fix orphaned aichatI18n reference left over
from staging merge.

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>

* fix: add ButtonOwnProps augmentation to component-library types.d.ts

Keep component-library and apps type augmentations in sync by adding
target/rel to ButtonOwnProps in both locations.

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>

* feat: add primary variant to cookie consent button and update migration status

* fix: enhance className handling for CustomDropdown trigger components

* lint fixes

* revert package.json changes

* wip type augmentation

* update mui, minor update comments

* fix MUI type augmentation for component-library consumers

Two issues prevented MUI type augmentations (tertiary color,
extraSmall size, target/rel anchor attrs) from reaching components
imported through @code-dot-org/component-library:

1. The component-library (portal-linked) has its own
   node_modules/@mui/material, so TypeScript resolved a different
   module instance than the one augmented in apps/. Added tsconfig
   paths to force a single resolution — the TS equivalent of the
   webpack alias from #71897.

2. ButtonOwnProps augmentation under '@mui/material/Button' has no
   effect with node16 moduleResolution because the interface is
   defined in Button/Button.d.ts and only re-exported through
   Button/index.d.ts — the subpath augmentation doesn't merge with
   the original definition. Targeting the barrel '@mui/material'
   resolves this.

Also reverts the @mui/material version bump (^7.3.2 -> ^7.3.5)
which was an earlier attempt to work around the type mismatch and
is no longer needed.

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>

* revert @mui/material version bump to ^7.3.2

The bump to ^7.3.5 was an earlier workaround for the type
augmentation issue, now properly fixed via tsconfig paths and
barrel module augmentation.

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>

---------

Co-authored-by: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
* Further Fine-tune Drone Unit Test Parallelization

See [here](https://codedotorg.slack.com/archives/C046G4TRLEN/p1776201335003539?thread_ts=1776184535.672089&cid=C046G4TRLEN) for more context

* make an arbitrary change to trigger unit tests

* Revert "make an arbitrary change to trigger unit tests"

This reverts commit 4f209a2.
* plumbing for new panel

* panel contents without functionality

* style cleanup

* remove demo comment

* refactor

* dummy function

* todos

* add start tour logic

* work on adding helper to check if tour is on level

* update product tours logic

* add override

* use filter

* clean up styling

* refactor

* copilot comments

* refactor to support split list

* styling and bugfix

* additional tests

* refactor and fix up start/end logic

* add explicit return type

* remove duplicate css import
@deploy-code-org deploy-code-org requested review from a team as code owners April 15, 2026 09:20
@deploy-code-org deploy-code-org merged commit c82a958 into levelbuilder Apr 15, 2026
4 checks passed
@deploy-code-org deploy-code-org deleted the dtl_candidate_4c5bff10 branch April 15, 2026 09:25
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

8 participants