From 140490f3122a49af2c3fdf058de04efd88102b7c Mon Sep 17 00:00:00 2001
From: Jaspreet-singh-1032 <jassimehra2612@gmail.com>
Date: Sun, 2 Jul 2023 14:23:00 +0530
Subject: [PATCH 1/4] removed scroll on adding new question

---
 .../AssessmentItemEditor/AssessmentItemEditor.vue          | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/contentcuration/contentcuration/frontend/channelEdit/components/AssessmentItemEditor/AssessmentItemEditor.vue b/contentcuration/contentcuration/frontend/channelEdit/components/AssessmentItemEditor/AssessmentItemEditor.vue
index c31c922508..28290e82d6 100644
--- a/contentcuration/contentcuration/frontend/channelEdit/components/AssessmentItemEditor/AssessmentItemEditor.vue
+++ b/contentcuration/contentcuration/frontend/channelEdit/components/AssessmentItemEditor/AssessmentItemEditor.vue
@@ -285,13 +285,6 @@
       if (!this.question) {
         this.openQuestion();
       }
-      // Assessments are nested inside of a scrolling panel.
-      // Instead of propagating an event all the way back to
-      // the scrolling panel, just use scrollIntoView
-      // (supported by most major browsers)
-      if (this.$el.scrollIntoView) {
-        this.$el.scrollIntoView({ behaviour: 'smooth' });
-      }
     },
     methods: {
       updateItem(payload) {

From 81283df4a335f9cd0b7865bc2ece04bf1550611b Mon Sep 17 00:00:00 2001
From: Jaspreet-singh-1032 <jassimehra2612@gmail.com>
Date: Thu, 20 Jul 2023 19:17:40 +0530
Subject: [PATCH 2/4]  scrollintoview with block end

---
 .../AssessmentItemEditor/AssessmentItemEditor.vue          | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/contentcuration/contentcuration/frontend/channelEdit/components/AssessmentItemEditor/AssessmentItemEditor.vue b/contentcuration/contentcuration/frontend/channelEdit/components/AssessmentItemEditor/AssessmentItemEditor.vue
index 28290e82d6..8985335750 100644
--- a/contentcuration/contentcuration/frontend/channelEdit/components/AssessmentItemEditor/AssessmentItemEditor.vue
+++ b/contentcuration/contentcuration/frontend/channelEdit/components/AssessmentItemEditor/AssessmentItemEditor.vue
@@ -285,6 +285,13 @@
       if (!this.question) {
         this.openQuestion();
       }
+      // Assessments are nested inside of a scrolling panel.
+      // Instead of propagating an event all the way back to
+      // the scrolling panel, just use scrollIntoView
+      // (supported by most major browsers)
+      if (this.$el.scrollIntoView) {
+        this.$el.scrollIntoView({ behaviour: 'smooth', block: 'end' });
+      }
     },
     methods: {
       updateItem(payload) {

From e0471848379e14d9cecda9badfbe36d2d6048ebf Mon Sep 17 00:00:00 2001
From: Jaspreet-singh-1032 <jassimehra2612@gmail.com>
Date: Thu, 27 Jul 2023 21:35:06 +0530
Subject: [PATCH 3/4] scroll to the question card

---
 .../AssessmentEditor/AssessmentEditor.vue           | 13 +++++++++++++
 .../AssessmentItemEditor/AssessmentItemEditor.vue   |  7 -------
 .../channelEdit/components/edit/EditView.vue        |  2 +-
 3 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/contentcuration/contentcuration/frontend/channelEdit/components/AssessmentEditor/AssessmentEditor.vue b/contentcuration/contentcuration/frontend/channelEdit/components/AssessmentEditor/AssessmentEditor.vue
index 8e405ad9c8..6dcac331cf 100644
--- a/contentcuration/contentcuration/frontend/channelEdit/components/AssessmentEditor/AssessmentEditor.vue
+++ b/contentcuration/contentcuration/frontend/channelEdit/components/AssessmentEditor/AssessmentEditor.vue
@@ -12,6 +12,7 @@
       <transition-group name="list-complete" tag="div">
         <VCard
           v-for="(item, idx) in sortedItems"
+          ref="questionCardRef"
           :key="`question-${item.assessment_id}`"
           pa-1
           class="elevation-4 list-complete-item"
@@ -333,6 +334,18 @@
         this.$analytics.trackAction('exercise_editor', 'Add', {
           eventLabel: 'Question',
         });
+        this.$nextTick(() => {
+          if (this.$refs['questionCardRef'].length >= 1) {
+            const lastQuestionCard = this.$refs['questionCardRef'][
+              this.$refs['questionCardRef'].length - 1
+            ].$el;
+            const editorDiv = document.getElementById('editViewId');
+            editorDiv.scrollTo({
+              top: lastQuestionCard.offsetTop,
+              behavior: 'smooth',
+            });
+          }
+        });
       },
       async deleteItem(itemToDelete) {
         if (this.isItemActive(itemToDelete)) {
diff --git a/contentcuration/contentcuration/frontend/channelEdit/components/AssessmentItemEditor/AssessmentItemEditor.vue b/contentcuration/contentcuration/frontend/channelEdit/components/AssessmentItemEditor/AssessmentItemEditor.vue
index 8985335750..28290e82d6 100644
--- a/contentcuration/contentcuration/frontend/channelEdit/components/AssessmentItemEditor/AssessmentItemEditor.vue
+++ b/contentcuration/contentcuration/frontend/channelEdit/components/AssessmentItemEditor/AssessmentItemEditor.vue
@@ -285,13 +285,6 @@
       if (!this.question) {
         this.openQuestion();
       }
-      // Assessments are nested inside of a scrolling panel.
-      // Instead of propagating an event all the way back to
-      // the scrolling panel, just use scrollIntoView
-      // (supported by most major browsers)
-      if (this.$el.scrollIntoView) {
-        this.$el.scrollIntoView({ behaviour: 'smooth', block: 'end' });
-      }
     },
     methods: {
       updateItem(payload) {
diff --git a/contentcuration/contentcuration/frontend/channelEdit/components/edit/EditView.vue b/contentcuration/contentcuration/frontend/channelEdit/components/edit/EditView.vue
index f3ce855b2e..4a1e0cebb5 100644
--- a/contentcuration/contentcuration/frontend/channelEdit/components/edit/EditView.vue
+++ b/contentcuration/contentcuration/frontend/channelEdit/components/edit/EditView.vue
@@ -1,6 +1,6 @@
 <template>
 
-  <VContainer ref="editview" fluid class="pa-0 wrapper" @scroll="scroll">
+  <VContainer id="editViewId" ref="editview" fluid class="pa-0 wrapper" @scroll="scroll">
     <VContainer v-if="!nodeIds.length" fluid>
       <VLayout justify-center align-center fill-height>
         <VFlex grow class="grey--text text-xs-center title">

From 68dbb7f8fe9ad8c13c9f44f872241d3977feb2ad Mon Sep 17 00:00:00 2001
From: Jaspreet-singh-1032 <jassimehra2612@gmail.com>
Date: Tue, 1 Aug 2023 19:24:31 +0530
Subject: [PATCH 4/4] final cleanup

---
 .../components/AssessmentEditor/AssessmentEditor.vue       | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/contentcuration/contentcuration/frontend/channelEdit/components/AssessmentEditor/AssessmentEditor.vue b/contentcuration/contentcuration/frontend/channelEdit/components/AssessmentEditor/AssessmentEditor.vue
index 6dcac331cf..5d9ff92c43 100644
--- a/contentcuration/contentcuration/frontend/channelEdit/components/AssessmentEditor/AssessmentEditor.vue
+++ b/contentcuration/contentcuration/frontend/channelEdit/components/AssessmentEditor/AssessmentEditor.vue
@@ -335,10 +335,9 @@
           eventLabel: 'Question',
         });
         this.$nextTick(() => {
-          if (this.$refs['questionCardRef'].length >= 1) {
-            const lastQuestionCard = this.$refs['questionCardRef'][
-              this.$refs['questionCardRef'].length - 1
-            ].$el;
+          const questionCards = this.$refs['questionCardRef'];
+          if (questionCards?.length >= 1) {
+            const lastQuestionCard = questionCards[questionCards.length - 1].$el;
             const editorDiv = document.getElementById('editViewId');
             editorDiv.scrollTo({
               top: lastQuestionCard.offsetTop,