Skip to content

Commit

Permalink
[Locked labels] Bugfix from merge conflict: Add back locked label set…
Browse files Browse the repository at this point in the history
…tings (#1550)

## Summary:
Somehow I messed up a merge and it added back the line that
stops the locked label settings from showing up.

Removing that check so that the locked label settings show up again.

Issue: https://khanacademy.atlassian.net/browse/LEMS-1795

## Test plan:
Storybook
- http://localhost:6006/?path=/story/perseuseditor-widgets-interactive-graph--mafs-with-locked-labels-flag

| Before | After |
| --- | --- |
| <img width="383" alt="Screenshot 2024-08-23 at 2 06 13 PM" src="https://github.com/user-attachments/assets/6e62e23d-a711-489d-9c82-1cf4bbfbe734"> | <img width="379" alt="Screenshot 2024-08-23 at 2 06 21 PM" src="https://github.com/user-attachments/assets/9530faac-4e6c-456d-a3bb-390a67c4dcbf"> |

Author: nishasy

Reviewers: mark-fitzgerald

Required Reviewers:

Approved By: mark-fitzgerald

Checks: ✅ codecov/project, ✅ codecov/patch, ✅ Upload Coverage (ubuntu-latest, 20.x), ✅ gerald, ✅ Cypress (ubuntu-latest, 20.x), ⏭️  Publish npm snapshot, ✅ Jest Coverage (ubuntu-latest, 20.x), ✅ Check for .changeset entries for all changed files (ubuntu-latest, 20.x), ✅ Check builds for changes in size (ubuntu-latest, 20.x), ✅ Lint, Typecheck, Format, and Test (ubuntu-latest, 20.x), 🚫 Upload Coverage, ✅ gerald, ⏭️  Publish npm snapshot, 🚫 Jest Coverage (ubuntu-latest, 20.x), 🚫 Check builds for changes in size (ubuntu-latest, 20.x), 🚫 Lint, Typecheck, Format, and Test (ubuntu-latest, 20.x), 🚫 Check for .changeset entries for all changed files (ubuntu-latest, 20.x), 🚫 Cypress (ubuntu-latest, 20.x), ✅ Publish Storybook to Chromatic (ubuntu-latest, 20.x), ✅ gerald

Pull Request URL: #1550
  • Loading branch information
nishasy authored Aug 23, 2024
1 parent ad3d3d7 commit 7c5de59
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 7 deletions.
5 changes: 5 additions & 0 deletions .changeset/green-otters-lick.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"@khanacademy/perseus-editor": patch
---

[Locked labels] Bugfix from merge conflict: Add back locked label settings
Original file line number Diff line number Diff line change
Expand Up @@ -163,13 +163,6 @@ const LockedFiguresSection = (props: Props) => {
{isExpanded && (
<View>
{figures?.map((figure, index) => {
if (figure.type === "label") {
// TODO(LEMS-1795): Add locked label settings.
// Remove this block once label locked figure
// settings are implemented.
return;
}

return (
<LockedFigureSettings
key={`${uniqueId}-locked-${figure}-${index}`}
Expand Down

0 comments on commit 7c5de59

Please sign in to comment.