From 7c5de59f25e77c8a5b6fd595647835b340c7aa3c Mon Sep 17 00:00:00 2001
From: Nisha Yerunkar <nisha@khanacademy.org>
Date: Fri, 23 Aug 2024 14:17:11 -0700
Subject: [PATCH] [Locked labels] Bugfix from merge conflict: Add back locked
 label settings (#1550)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

## 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: https://github.com/Khan/perseus/pull/1550
---
 .changeset/green-otters-lick.md                            | 5 +++++
 .../graph-locked-figures/locked-figures-section.tsx        | 7 -------
 2 files changed, 5 insertions(+), 7 deletions(-)
 create mode 100644 .changeset/green-otters-lick.md

diff --git a/.changeset/green-otters-lick.md b/.changeset/green-otters-lick.md
new file mode 100644
index 0000000000..0152304c89
--- /dev/null
+++ b/.changeset/green-otters-lick.md
@@ -0,0 +1,5 @@
+---
+"@khanacademy/perseus-editor": patch
+---
+
+[Locked labels] Bugfix from merge conflict: Add back locked label settings
diff --git a/packages/perseus-editor/src/components/graph-locked-figures/locked-figures-section.tsx b/packages/perseus-editor/src/components/graph-locked-figures/locked-figures-section.tsx
index 52b9b1d319..be786e19bc 100644
--- a/packages/perseus-editor/src/components/graph-locked-figures/locked-figures-section.tsx
+++ b/packages/perseus-editor/src/components/graph-locked-figures/locked-figures-section.tsx
@@ -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}`}