remove unused relativePosition from script editor

code-dot-org · Oct 25, 2020 · 771264e · 771264e
1 parent 67d4f85
commit 771264e
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 42 deletions.
diff --git a/apps/src/lib/levelbuilder/script-editor/scriptEditorRedux.js b/apps/src/lib/levelbuilder/script-editor/scriptEditorRedux.js
@@ -114,16 +114,9 @@ function updateGroupPositions(lessonGroups) {
 }
 
 function updateLessonPositions(lessonGroups) {
-  let relativePosition = 1;
   lessonGroups.forEach(lessonGroup => {
     lessonGroup.lessons.forEach((lesson, lessonIndex) => {
       lesson.position = lessonIndex + 1;
-      if (lesson.lockable) {
-        lesson.relativePosition = undefined;
-      } else {
-        lesson.relativePosition = relativePosition;
-        relativePosition++;
-      }
     });
   });
 }

diff --git a/apps/src/sites/studio/pages/scripts/edit.js b/apps/src/sites/studio/pages/scripts/edit.js
@@ -31,7 +31,6 @@ export default function initPage(scriptEditorData) {
           id: lesson.id,
           key: lesson.key,
           position: lessonIndex + 1,
-          relativePosition: lesson.relative_position,
           lockable: lesson.lockable,
           assessment: lesson.assessment,
           unplugged: lesson.unplugged,

diff --git a/apps/test/unit/code-studio/scriptEditorReduxTest.js b/apps/test/unit/code-studio/scriptEditorReduxTest.js
@@ -129,19 +129,13 @@ describe('scriptEditorRedux reducer tests', () => {
           key: 'x',
           displayName: 'X',
           position: 1,
-          lessons: [
-            {id: 101, position: 1, relativePosition: 1},
-            {id: 102, position: 2, relativePosition: 2}
-          ]
+          lessons: [{id: 101, position: 1}, {id: 102, position: 2}]
         },
         {
           key: 'y',
           displayName: 'Y',
           position: 2,
-          lessons: [
-            {id: 103, position: 3, relativePosition: 3},
-            {id: 104, position: 4, relativePosition: 4}
-          ]
+          lessons: [{id: 103, position: 3}, {id: 104, position: 4}]
         }
       ];
       initialState.lessonGroups = initialLessonGroups;
@@ -177,19 +171,13 @@ describe('scriptEditorRedux reducer tests', () => {
             key: 'x',
             displayName: 'X',
             position: 1,
-            lessons: [
-              {id: 101, position: 1, relativePosition: 1},
-              {id: 102, position: 2, relativePosition: 2}
-            ]
+            lessons: [{id: 101, position: 1}, {id: 102, position: 2}]
           },
           {
             key: 'y',
             displayName: 'Y',
             position: 2,
-            lessons: [
-              {id: 104, position: 1, relativePosition: 3},
-              {id: 103, position: 2, relativePosition: 4}
-            ]
+            lessons: [{id: 104, position: 1}, {id: 103, position: 2}]
           }
         ],
         state.lessonGroups,
@@ -210,16 +198,16 @@ describe('scriptEditorRedux reducer tests', () => {
             displayName: 'X',
             position: 1,
             lessons: [
-              {id: 101, position: 1, relativePosition: 1},
-              {id: 102, position: 2, relativePosition: 2},
-              {id: 104, position: 3, relativePosition: 3}
+              {id: 101, position: 1},
+              {id: 102, position: 2},
+              {id: 104, position: 3}
             ]
           },
           {
             key: 'y',
             displayName: 'Y',
             position: 2,
-            lessons: [{id: 103, position: 1, relativePosition: 4}]
+            lessons: [{id: 103, position: 1}]
           }
         ],
         state.lessonGroups,
@@ -240,16 +228,16 @@ describe('scriptEditorRedux reducer tests', () => {
             displayName: 'X',
             position: 1,
             lessons: [
-              {id: 101, position: 1, relativePosition: 1},
-              {id: 104, position: 2, relativePosition: 2},
-              {id: 102, position: 3, relativePosition: 3}
+              {id: 101, position: 1},
+              {id: 104, position: 2},
+              {id: 102, position: 3}
             ]
           },
           {
             key: 'y',
             displayName: 'Y',
             position: 2,
-            lessons: [{id: 103, position: 1, relativePosition: 4}]
+            lessons: [{id: 103, position: 1}]
           }
         ],
         state.lessonGroups,
@@ -266,16 +254,16 @@ describe('scriptEditorRedux reducer tests', () => {
               key: 'x',
               displayName: 'X',
               position: 1,
-              lessons: [{id: 101, position: 1, relativePosition: 1}]
+              lessons: [{id: 101, position: 1}]
             },
             {
               key: 'y',
               displayName: 'Y',
               position: 2,
               lessons: [
-                {id: 103, position: 1, relativePosition: 2},
-                {id: 104, position: 2, relativePosition: 3},
-                {id: 102, position: 3, relativePosition: 4}
+                {id: 103, position: 1},
+                {id: 104, position: 2},
+                {id: 102, position: 3}
               ]
             }
           ],
@@ -294,22 +282,20 @@ describe('scriptEditorRedux reducer tests', () => {
               lessons: [
                 {
                   id: 101,
-                  position: 1,
-                  relativePosition: 1
+                  position: 1
                 },
                 {
                   id: 102,
-                  position: 2,
-                  relativePosition: 2
+                  position: 2
                 },
-                {id: 104, position: 3, relativePosition: 3}
+                {id: 104, position: 3}
               ]
             },
             {
               key: 'y',
               displayName: 'Y',
               position: 2,
-              lessons: [{id: 103, position: 1, relativePosition: 4}]
+              lessons: [{id: 103, position: 1}]
             }
           ],
           newState.lessonGroups