From dfeea15c90aef709c43b818183bc0029bd0f971d Mon Sep 17 00:00:00 2001
From: Jacob Pierce <w.jacobpierce@gmail.com>
Date: Fri, 23 Feb 2024 12:54:07 -0800
Subject: [PATCH 01/67] questions are replaced successfully & select all logic
 fixed

---
 .../assets/src/composables/useQuizCreation.js |  29 ++-
 .../plan/CreateExamPage/ReplaceQuestions.vue  | 234 +++++++++++++++++-
 2 files changed, 247 insertions(+), 16 deletions(-)

diff --git a/kolibri/plugins/coach/assets/src/composables/useQuizCreation.js b/kolibri/plugins/coach/assets/src/composables/useQuizCreation.js
index 7ee8fdd9fae..7bd4aa8ca94 100644
--- a/kolibri/plugins/coach/assets/src/composables/useQuizCreation.js
+++ b/kolibri/plugins/coach/assets/src/composables/useQuizCreation.js
@@ -356,9 +356,13 @@ export default function useQuizCreation(DEBUG = false) {
     }
   }
 
+  function clearSelectedQuestions() {
+    set(_selectedQuestionIds, []);
+  }
+
   function selectAllQuestions() {
     if (get(allQuestionsSelected)) {
-      set(_selectedQuestionIds, []);
+      clearSelectedQuestions();
     } else {
       set(
         _selectedQuestionIds,
@@ -431,11 +435,14 @@ export default function useQuizCreation(DEBUG = false) {
 
   /** @type {ComputedRef<Boolean>} Whether all active questions are selected */
   const allQuestionsSelected = computed(() => {
-    return isEqual(
-      get(selectedActiveQuestions).sort(),
-      get(activeQuestions)
-        .map(q => q.question_id)
-        .sort()
+    return (
+      get(selectedActiveQuestions).length &&
+      isEqual(
+        get(selectedActiveQuestions).sort(),
+        get(activeQuestions)
+          .map(q => q.question_id)
+          .sort()
+      )
     );
   });
 
@@ -478,6 +485,7 @@ export default function useQuizCreation(DEBUG = false) {
   provide('updateQuiz', updateQuiz);
   provide('addQuestionToSelection', addQuestionToSelection);
   provide('removeQuestionFromSelection', removeQuestionFromSelection);
+  provide('clearSelectedQuestions', clearSelectedQuestions);
   provide('channels', channels);
   provide('quiz', quiz);
   provide('allSections', allSections);
@@ -488,6 +496,8 @@ export default function useQuizCreation(DEBUG = false) {
   provide('activeQuestionsPool', activeQuestionsPool);
   provide('activeQuestions', activeQuestions);
   provide('selectedActiveQuestions', selectedActiveQuestions);
+  provide('allQuestionsSelected', allQuestionsSelected);
+  provide('selectAllIsIndeterminate', selectAllIsIndeterminate);
   provide('replacementQuestionPool', replacementQuestionPool);
   provide('selectAllQuestions', selectAllQuestions);
   provide('deleteActiveSelectedQuestions', deleteActiveSelectedQuestions);
@@ -503,6 +513,7 @@ export default function useQuizCreation(DEBUG = false) {
     setActiveSection,
     initializeQuiz,
     updateQuiz,
+    clearSelectedQuestions,
     addQuestionToSelection,
     removeQuestionFromSelection,
 
@@ -545,6 +556,7 @@ export function injectQuizCreation() {
   const updateQuiz = inject('updateQuiz');
   const addQuestionToSelection = inject('addQuestionToSelection');
   const removeQuestionFromSelection = inject('removeQuestionFromSelection');
+  const clearSelectedQuestions = inject('clearSelectedQuestions');
   const channels = inject('channels');
   const quiz = inject('quiz');
   const allSections = inject('allSections');
@@ -554,6 +566,8 @@ export function injectQuizCreation() {
   const activeResourceMap = inject('activeResourceMap');
   const activeQuestionsPool = inject('activeQuestionsPool');
   const activeQuestions = inject('activeQuestions');
+  const allQuestionsSelected = inject('allQuestionsSelected');
+  const selectAllIsIndeterminate = inject('selectAllIsIndeterminate');
   const selectedActiveQuestions = inject('selectedActiveQuestions');
   const replacementQuestionPool = inject('replacementQuestionPool');
   const selectAllQuestions = inject('selectAllQuestions');
@@ -572,11 +586,14 @@ export function injectQuizCreation() {
     setActiveSection,
     initializeQuiz,
     updateQuiz,
+    clearSelectedQuestions,
     addQuestionToSelection,
     removeQuestionFromSelection,
     toggleQuestionInSelection,
 
     // Computed
+    allQuestionsSelected,
+    selectAllIsIndeterminate,
     channels,
     quiz,
     allSections,
diff --git a/kolibri/plugins/coach/assets/src/views/plan/CreateExamPage/ReplaceQuestions.vue b/kolibri/plugins/coach/assets/src/views/plan/CreateExamPage/ReplaceQuestions.vue
index 84aa74a48c8..39c349a38bc 100644
--- a/kolibri/plugins/coach/assets/src/views/plan/CreateExamPage/ReplaceQuestions.vue
+++ b/kolibri/plugins/coach/assets/src/views/plan/CreateExamPage/ReplaceQuestions.vue
@@ -1,15 +1,124 @@
 <template>
 
   <div>
-    <h1>Replace questions</h1>
-    <p v-for="(question, index) in selectedActiveQuestions.value" :key="`${index}q`">
-      {{ JSON.stringify(question) }}
-    </p>
-    <h2>
-      <KRouterLink appearance="raised-button" :to="{ path: 'select-resources' }">
-        Select resources
-      </KRouterLink>
-    </h2>
+    <h1 class="section-header" :style="{ color: `${$themeTokens.annotation}` }">
+      {{ activeSection.section_title }}
+    </h1>
+    <span
+      class="divider"
+      :style="{ borderTop: `solid 1px ${$themeTokens.fineLine}` }"
+    >
+    </span>
+    <h1 class="section-header">
+      {{ replaceQuestions$() }}
+    </h1>
+    <p>{{ replaceQuestionsExplaination$() }}</p>
+    <span
+      class="divider"
+      :style="{ borderTop: `solid 1px ${$themeTokens.fineLine}` }"
+    >
+    </span>
+    <AccordionContainer
+      :items="replacementQuestionPool.map(i => ({
+        id: i.question_id,
+      }))"
+    >
+      <template #left-actions>
+        <KCheckbox
+          ref="selectAllCheckbox"
+          class="select-all-box"
+          :label="selectAllLabel$()"
+          :checked="replacements.length === replacementQuestionPool.length"
+          :indeterminate="selectAllIsIndeterminate"
+          @change="() => selectAllQuestions()"
+        />
+      </template>
+      <template #default="{ toggleItemState, isItemExpanded }">
+        <AccordionItem
+          v-for="(question, index) in replacementQuestionPool"
+          :id="question.question_id"
+          :key="index"
+          :title="question.title"
+        >
+          <template #heading="{ title }">
+            <h3
+              class="accordion-header"
+            >
+              <KCheckbox
+                style="padding-left: 0.5em"
+                :checked="replacements.map(q => q.id).includes(
+                  question.question_id
+                )"
+                @change="() => toggleInReplacements(question)"
+              />
+              <KButton
+                tabindex="0"
+                appearance="basic-link"
+                :style="accordionStyleOverrides"
+                class="accordion-header-label"
+                :aria-expanded="isItemExpanded(question.question_id)"
+                :aria-controls="`question-panel-${question.question_id}`"
+                @click="toggleItemState(question.question_id)"
+              >
+                <span>{{ title + " " + question.counter_in_exercise }}</span>
+                <KIcon
+                  style="position: absolute; right:0; top: 0.92em"
+                  :icon="isItemExpanded(question.question_id) ?
+                    'chevronUp' : 'chevronRight'"
+                />
+              </KButton>
+            </h3>
+          </template>
+          <template #content>
+            <div
+              :id="`question-panel-${question.question_id}`"
+              :ref="`question-panel-${question.question_id}`"
+            >
+              <p
+                v-if="isItemExpanded(question.question_id)"
+                class="question-content-panel"
+              >
+                CONTENT OF {{ question.title }}
+              </p>
+            </div>
+          </template>
+        </AccordionItem>
+      </template>
+    </AccordionContainer>
+    <div class="bottom-buttons-style">
+      <KGrid>
+        <KGridItem
+          style="text-align: left;"
+          :layout12="{ span: 8 }"
+          :layout8="{ span: 6 }"
+          :layout4="{ span: 3 }"
+        >
+          {{ numberOfSelectedReplacements$({
+            count: replacements.length,
+            total: selectedActiveQuestions.length }
+          )
+          }}
+        </KGridItem>
+        <KGridItem
+          style="text-align: right;"
+          :layout12="{ span: 4 }"
+          :layout8="{ span: 2 }"
+          :layout4="{ span: 1 }"
+        >
+          <KButton
+            :primary="true"
+            :text="replaceAction$()"
+            :disable="replacements.length !== selectedActiveQuestions.length"
+            @click="handleReplacement"
+          />
+        </KGridItem>
+      </KGrid>
+    </div>
+    <ConfirmCancellationModal
+      v-if="showConfirmationModal"
+      @cancel="handleCancelClose"
+      @continue="handleConfirmClose"
+    />
   </div>
 
 </template>
@@ -17,19 +126,124 @@
 
 <script>
 
+  import { enhancedQuizManagementStrings } from 'kolibri-common/strings/enhancedQuizManagementStrings';
+  import { ref } from 'kolibri.lib.vueCompositionApi';
+  import { get } from '@vueuse/core';
   import { injectQuizCreation } from '../../../composables/useQuizCreation';
+  import AccordionItem from './AccordionItem';
+  import AccordionContainer from './AccordionContainer';
+  import ConfirmCancellationModal from './ConfirmCancellationModal';
 
   export default {
     name: 'ReplaceQuestions',
-    setup() {
+    components: {
+      AccordionContainer,
+      AccordionItem,
+      ConfirmCancellationModal,
+    },
+    setup(_, context) {
+      const {
+        replaceQuestions$,
+        deleteSectionLabel$,
+        replaceAction$,
+        selectAllLabel$,
+        replaceQuestionsExplaination$,
+        numberOfSelectedReplacements$,
+      } = enhancedQuizManagementStrings;
       const {
         // Computed
+        activeQuestions,
+        activeSection,
         selectedActiveQuestions,
+        replacementQuestionPool,
+        selectAllIsIndeterminate,
+        clearSelectedQuestions,
+        toggleItemState,
+        isItemExpanded,
+        selectAllReplacementQuestions,
+        replaceSelectedQuestions,
+        toggleQuestionInSelection,
+        updateSection,
       } = injectQuizCreation();
+
+      const showConfirmationModal = ref(false);
+
+      function handleCancelClose() {
+        showConfirmationModal.value = false;
+      }
+
+      function handleConfirmClose() {
+        context.emit('closePanel');
+      }
+
+      const replacements = ref([]);
+
+      function handleReplacement() {
+        const questionsNotSelectedToBeReplaced = activeQuestions.value.filter(
+          question => !selectedActiveQuestions.value.includes(question.question_id)
+        );
+        updateSection({
+          section_id: activeSection.value.section_id,
+          questions: [...questionsNotSelectedToBeReplaced, ...replacements.value],
+        });
+        clearSelectedQuestions();
+        context.emit('closePanel');
+      }
+
+      function toggleInReplacements(question) {
+        const replacementIds = replacements.value.map(q => q.question_id);
+        if (replacementIds.includes(question.question_id)) {
+          replacements.value = replacements.value.filter(
+            q => q.question_id !== question.question_id
+          );
+        } else {
+          replacements.value.push(question);
+        }
+      }
+
       return {
+        activeQuestions,
+        activeSection,
         selectedActiveQuestions,
+        toggleInReplacements,
+        handleReplacement,
+        handleCancelClose,
+        handleConfirmClose,
+        replacementQuestionPool,
+        selectAllIsIndeterminate,
+        clearSelectedQuestions,
+        toggleItemState,
+        isItemExpanded,
+        selectAllReplacementQuestions,
+        replaceSelectedQuestions,
+        toggleQuestionInSelection,
+        updateSection,
+        replaceQuestions$,
+        deleteSectionLabel$,
+        replaceAction$,
+        selectAllLabel$,
+        replaceQuestionsExplaination$,
+        numberOfSelectedReplacements$,
       };
     },
+    computed: {
+      accordionStyleOverrides() {
+        return {
+          color: this.$themeTokens.text + '!important',
+          textDecoration: 'none',
+          // Ensure text doesn't get highlighted as we drag
+          userSelect: get(this.dragActive) ? 'none!important' : 'text',
+        };
+      },
+    },
+    beforeRouteLeave(_, __, next) {
+      if (!this.showConfirmationModal && this.formDataHasChanged) {
+        this.showConfirmationModal = true;
+        next(false);
+      } else {
+        next();
+      }
+    },
   };
 
 </script>

From 229d8c21fc72ae1b52752a4642048627352b5ef0 Mon Sep 17 00:00:00 2001
From: Jacob Pierce <w.jacobpierce@gmail.com>
Date: Sun, 25 Feb 2024 21:42:33 -0800
Subject: [PATCH 02/67] fix checkbox logic on replacement list

---
 .../views/plan/CreateExamPage/ReplaceQuestions.vue   | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/kolibri/plugins/coach/assets/src/views/plan/CreateExamPage/ReplaceQuestions.vue b/kolibri/plugins/coach/assets/src/views/plan/CreateExamPage/ReplaceQuestions.vue
index 39c349a38bc..a3445fda6a4 100644
--- a/kolibri/plugins/coach/assets/src/views/plan/CreateExamPage/ReplaceQuestions.vue
+++ b/kolibri/plugins/coach/assets/src/views/plan/CreateExamPage/ReplaceQuestions.vue
@@ -28,7 +28,7 @@
           ref="selectAllCheckbox"
           class="select-all-box"
           :label="selectAllLabel$()"
-          :checked="replacements.length === replacementQuestionPool.length"
+          :checked="replacements.length && replacements.length === selectedActiveQuestions.length"
           :indeterminate="selectAllIsIndeterminate"
           @change="() => selectAllQuestions()"
         />
@@ -127,7 +127,7 @@
 <script>
 
   import { enhancedQuizManagementStrings } from 'kolibri-common/strings/enhancedQuizManagementStrings';
-  import { ref } from 'kolibri.lib.vueCompositionApi';
+  import { computed, ref } from 'kolibri.lib.vueCompositionApi';
   import { get } from '@vueuse/core';
   import { injectQuizCreation } from '../../../composables/useQuizCreation';
   import AccordionItem from './AccordionItem';
@@ -156,7 +156,6 @@
         activeSection,
         selectedActiveQuestions,
         replacementQuestionPool,
-        selectAllIsIndeterminate,
         clearSelectedQuestions,
         toggleItemState,
         isItemExpanded,
@@ -201,6 +200,13 @@
         }
       }
 
+      const selectAllIsIndeterminate = computed(() => {
+        return (
+          replacements.value.length > 0 &&
+          replacements.value.length !== selectedActiveQuestions.value.length
+        );
+      });
+
       return {
         activeQuestions,
         activeSection,

From 1991ef7ea17f5e44da565daca5c5c0e46486f7ae Mon Sep 17 00:00:00 2001
From: Jacob Pierce <w.jacobpierce@gmail.com>
Date: Sun, 25 Feb 2024 22:04:33 -0800
Subject: [PATCH 03/67] breadcrumbs polish

---
 .../plan/CreateExamPage/ResourceSelection.vue      | 14 +++-----------
 1 file changed, 3 insertions(+), 11 deletions(-)

diff --git a/kolibri/plugins/coach/assets/src/views/plan/CreateExamPage/ResourceSelection.vue b/kolibri/plugins/coach/assets/src/views/plan/CreateExamPage/ResourceSelection.vue
index 80315507f76..c5896a3185c 100644
--- a/kolibri/plugins/coach/assets/src/views/plan/CreateExamPage/ResourceSelection.vue
+++ b/kolibri/plugins/coach/assets/src/views/plan/CreateExamPage/ResourceSelection.vue
@@ -60,7 +60,7 @@
 
       <ResourceSelectionBreadcrumbs
         v-if="isTopicIdSet"
-        :ancestors="topic.ancestors"
+        :ancestors="[...topic.ancestors, topic]"
         :channelsLink="channelsLink"
         :topicsLink="topicsLink"
       />
@@ -579,16 +579,8 @@
 
         return {}; // or return {} if you prefer an empty object
       },
-      topicListingLink({ topicId }) {
-        return this.$router.getRoute(
-          PageNames.QUIZ_SELECT_RESOURCES,
-          { topicId },
-          this.$route.query
-        );
-      },
-
-      topicsLink(topicId) {
-        return this.topicListingLink({ ...this.$route.params, topicId });
+      topicsLink(topic_id) {
+        return this.$router.getRoute(PageNames.QUIZ_SELECT_RESOURCES, { topic_id });
       },
       saveSelectedResource() {
         this.updateSection({

From 61675d88c26454e01a26e729cf4a405b9c744430 Mon Sep 17 00:00:00 2001
From: Jacob Pierce <w.jacobpierce@gmail.com>
Date: Sun, 25 Feb 2024 22:45:27 -0800
Subject: [PATCH 04/67] channels link breadcrumbs works properly

---
 .../assets/src/views/plan/CreateExamPage/ResourceSelection.vue  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/kolibri/plugins/coach/assets/src/views/plan/CreateExamPage/ResourceSelection.vue b/kolibri/plugins/coach/assets/src/views/plan/CreateExamPage/ResourceSelection.vue
index c5896a3185c..16e2fe8a3b7 100644
--- a/kolibri/plugins/coach/assets/src/views/plan/CreateExamPage/ResourceSelection.vue
+++ b/kolibri/plugins/coach/assets/src/views/plan/CreateExamPage/ResourceSelection.vue
@@ -521,7 +521,7 @@
         };
       },
       channelsLink() {
-        return this.$router.getRoute(PageNames.QUIZ_SELECT_RESOURCES);
+        return this.$router.getRoute(PageNames.QUIZ_SELECT_RESOURCES, { topic_id: null });
       },
       /*
       selectAllIsVisible() {

From 7dd656f9e06a5f37086587c0f688a5b8533e142c Mon Sep 17 00:00:00 2001
From: Jacob Pierce <w.jacobpierce@gmail.com>
Date: Sun, 25 Feb 2024 22:58:28 -0800
Subject: [PATCH 05/67] side panel doesn't open if the section_id in the URL is
 bad

---
 .../plan/CreateExamPage/SectionSidePanel.vue  | 39 +++++++++++++++++--
 1 file changed, 36 insertions(+), 3 deletions(-)

diff --git a/kolibri/plugins/coach/assets/src/views/plan/CreateExamPage/SectionSidePanel.vue b/kolibri/plugins/coach/assets/src/views/plan/CreateExamPage/SectionSidePanel.vue
index 0a42fc0a9ea..debfaf40b46 100644
--- a/kolibri/plugins/coach/assets/src/views/plan/CreateExamPage/SectionSidePanel.vue
+++ b/kolibri/plugins/coach/assets/src/views/plan/CreateExamPage/SectionSidePanel.vue
@@ -1,6 +1,7 @@
 <template>
 
   <SidePanelModal
+    v-if="showSidePanel"
     ref="resourcePanel"
     alignment="right"
     sidePanelWidth="700px"
@@ -17,13 +18,48 @@
 <script>
 
   import SidePanelModal from 'kolibri-common/components/SidePanelModal';
+  import { computed, getCurrentInstance } from 'kolibri.lib.vueCompositionApi';
+  import logging from 'kolibri.lib.logging';
+  import { injectQuizCreation } from '../../../composables/useQuizCreation';
   import { PageNames } from '../../../constants';
 
+  const logger = logging.getLogger(__filename);
+
   export default {
     name: 'SectionSidePanel',
     components: {
       SidePanelModal,
     },
+    setup() {
+      const { activeSection } = injectQuizCreation();
+      const store = getCurrentInstance().proxy.$store;
+      const router = getCurrentInstance().proxy.$router;
+      const route = computed(() => store.state.route);
+      const section_id = computed(() => route.value.params.section_id);
+
+      function handleClosePanel() {
+        router.push({
+          name: PageNames.EXAM_CREATION_ROOT,
+          params: { section_id: null },
+        });
+      }
+
+      /**
+       * Avoids flashing the side panel when we're going to just hide it anyway.
+       */
+      let showSidePanel = false;
+
+      if (section_id.value !== activeSection.value.section_id) {
+        logger.warn("Section ID doesn't match active section ID, forcing close of side panel.");
+        handleClosePanel();
+      } else {
+        showSidePanel = true;
+      }
+      return {
+        showSidePanel,
+        handleClosePanel,
+      };
+    },
     data() {
       return {
         prevRoute: { name: PageNames.EXAM_CREATION_ROOT },
@@ -50,9 +86,6 @@
       },
     },
     methods: {
-      handleClosePanel() {
-        this.$router.push({ name: PageNames.EXAM_CREATION_ROOT });
-      },
       /**
        * Calls the currently displayed ref's focusFirstEl method.
        */

From c5e6af92d3a96ae54364cac4ba2cf23c3485fae5 Mon Sep 17 00:00:00 2001
From: Jacob Pierce <w.jacobpierce@gmail.com>
Date: Sun, 25 Feb 2024 23:01:56 -0800
Subject: [PATCH 06/67] show questions in replacements accordions

---
 .../plan/CreateExamPage/ReplaceQuestions.vue  | 41 +++++++++++++------
 1 file changed, 28 insertions(+), 13 deletions(-)

diff --git a/kolibri/plugins/coach/assets/src/views/plan/CreateExamPage/ReplaceQuestions.vue b/kolibri/plugins/coach/assets/src/views/plan/CreateExamPage/ReplaceQuestions.vue
index a3445fda6a4..8176a1a26be 100644
--- a/kolibri/plugins/coach/assets/src/views/plan/CreateExamPage/ReplaceQuestions.vue
+++ b/kolibri/plugins/coach/assets/src/views/plan/CreateExamPage/ReplaceQuestions.vue
@@ -71,15 +71,26 @@
           </template>
           <template #content>
             <div
+              v-if="isItemExpanded(question.question_id)"
               :id="`question-panel-${question.question_id}`"
               :ref="`question-panel-${question.question_id}`"
+              :style="{ userSelect: dragActive ? 'none!important' : 'text' }"
             >
-              <p
-                v-if="isItemExpanded(question.question_id)"
-                class="question-content-panel"
-              >
-                CONTENT OF {{ question.title }}
-              </p>
+              <ContentRenderer
+                :ref="`contentRenderer-${question.question_id}`"
+                :kind="activeResourceMap[question.exercise_id].kind"
+                :lang="activeResourceMap[question.exercise_id].lang"
+                :files="activeResourceMap[question.exercise_id].files"
+                :available="activeResourceMap[question.exercise_id].available"
+                :itemId="question.question_id"
+                :assessment="true"
+                :allowHints="false"
+                :interactive="false"
+                @interaction="() => null"
+                @updateProgress="() => null"
+                @updateContentState="() => null"
+                @error="err => $emit('error', err)"
+              />
             </div>
           </template>
         </AccordionItem>
@@ -155,6 +166,7 @@
         activeQuestions,
         activeSection,
         selectedActiveQuestions,
+        activeResourceMap,
         replacementQuestionPool,
         clearSelectedQuestions,
         toggleItemState,
@@ -208,20 +220,23 @@
       });
 
       return {
-        activeQuestions,
-        activeSection,
-        selectedActiveQuestions,
         toggleInReplacements,
         handleReplacement,
-        handleCancelClose,
-        handleConfirmClose,
+        replacements,
+        activeSection,
+        selectAllReplacementQuestions,
+        selectedActiveQuestions,
         replacementQuestionPool,
         selectAllIsIndeterminate,
+        replaceSelectedQuestions,
+        activeResourceMap,
+
+        showConfirmationModal,
+        handleCancelClose,
+        handleConfirmClose,
         clearSelectedQuestions,
         toggleItemState,
         isItemExpanded,
-        selectAllReplacementQuestions,
-        replaceSelectedQuestions,
         toggleQuestionInSelection,
         updateSection,
         replaceQuestions$,

From 218df74e9095b4c0360e694e41d502f3a46130f0 Mon Sep 17 00:00:00 2001
From: Jacob Pierce <w.jacobpierce@gmail.com>
Date: Tue, 13 Feb 2024 15:00:18 -0800
Subject: [PATCH 07/67] active & replacement question pools in useQuizCreation

---
 .../assets/src/composables/useQuizCreation.js    | 16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)

diff --git a/kolibri/plugins/coach/assets/src/composables/useQuizCreation.js b/kolibri/plugins/coach/assets/src/composables/useQuizCreation.js
index 7bd4aa8ca94..5fbecfe7549 100644
--- a/kolibri/plugins/coach/assets/src/composables/useQuizCreation.js
+++ b/kolibri/plugins/coach/assets/src/composables/useQuizCreation.js
@@ -418,7 +418,16 @@ export default function useQuizCreation(DEBUG = false) {
   );
   /** @type {ComputedRef<QuizQuestion[]>} All questions in the active section's `resource_pool`
    *                                      exercises */
-  const activeQuestionsPool = computed(() => []);
+  const activeQuestionsPool = computed(() => {
+    const pool = get(activeResourcePool);
+    return selectQuestions(
+      pool.reduce((count, r) => count + r.assessmentmetadata.assessment_item_ids.length, 0),
+      pool.map(r => r.content_id),
+      pool.map(r => r.title),
+      pool.map(r => r.assessmentmetadata.assessment_item_ids),
+      get(_quiz).seed
+    );
+  });
   /** @type {ComputedRef<QuizQuestion[]>} All questions in the active section's `questions` property
    *                                      those which are currently set to be used in the section */
   const activeQuestions = computed(() => get(activeSection).questions);
@@ -426,7 +435,10 @@ export default function useQuizCreation(DEBUG = false) {
   const selectedActiveQuestions = computed(() => get(_selectedQuestionIds));
   /** @type {ComputedRef<QuizQuestion[]>} Questions in the active section's `resource_pool` that
    *                                         are not in `questions` */
-  const replacementQuestionPool = computed(() => {});
+  const replacementQuestionPool = computed(() => {
+    const activeQuestionIds = get(activeQuestions).map(q => q.question_id);
+    return get(activeQuestionsPool).filter(q => !activeQuestionIds.includes(q.question_id));
+  });
   /** @type {ComputedRef<Array>} A list of all channels available which have exercises */
   const channels = computed(() => get(_channels));
 

From e2fb1c4c632d890ceab2f42aae4c41d45c52ef71 Mon Sep 17 00:00:00 2001
From: Jacob Pierce <w.jacobpierce@gmail.com>
Date: Tue, 13 Feb 2024 14:59:49 -0800
Subject: [PATCH 08/67] update x of y replacements selected string

---
 .../kolibri-common/strings/enhancedQuizManagementStrings.js     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/kolibri-common/strings/enhancedQuizManagementStrings.js b/packages/kolibri-common/strings/enhancedQuizManagementStrings.js
index 6cb72972747..f72e5bbd278 100644
--- a/packages/kolibri-common/strings/enhancedQuizManagementStrings.js
+++ b/packages/kolibri-common/strings/enhancedQuizManagementStrings.js
@@ -141,7 +141,7 @@ export const enhancedQuizManagementStrings = createTranslator('EnhancedQuizManag
   },
   numberOfSelectedReplacements: {
     message:
-      '{ count, number } of{ count, number } {count, plural, one {question selected} other {questions selected}}',
+      '{ count, number } of { total, number } {total, plural, one {replacement selected} other {replacements selected}}',
   },
   numberOfQuestionsReplaced: {
     message:

From cad04b307112eca21df7ddceaddf29b71afbc402 Mon Sep 17 00:00:00 2001
From: Jacob Pierce <w.jacobpierce@gmail.com>
Date: Tue, 13 Feb 2024 14:59:57 -0800
Subject: [PATCH 09/67] remove unused style

---
 .../coach/assets/src/views/plan/CreateExamPage/SectionEditor.vue | 1 -
 1 file changed, 1 deletion(-)

diff --git a/kolibri/plugins/coach/assets/src/views/plan/CreateExamPage/SectionEditor.vue b/kolibri/plugins/coach/assets/src/views/plan/CreateExamPage/SectionEditor.vue
index 57042cc5d68..d3d945dcce7 100644
--- a/kolibri/plugins/coach/assets/src/views/plan/CreateExamPage/SectionEditor.vue
+++ b/kolibri/plugins/coach/assets/src/views/plan/CreateExamPage/SectionEditor.vue
@@ -208,7 +208,6 @@
           <KButton
             :primary="true"
             :text="applySettings$()"
-            class="apply-settings-style"
             @click="applySettings"
           />
 

From 77a408485731044a6dd0dc91ed76e746a2d70a39 Mon Sep 17 00:00:00 2001
From: Jacob Pierce <w.jacobpierce@gmail.com>
Date: Tue, 13 Feb 2024 15:00:38 -0800
Subject: [PATCH 10/67] add counter_in_exercise to question titles in main
 accordion

---
 .../assets/src/views/plan/CreateExamPage/CreateQuizSection.vue  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/kolibri/plugins/coach/assets/src/views/plan/CreateExamPage/CreateQuizSection.vue b/kolibri/plugins/coach/assets/src/views/plan/CreateExamPage/CreateQuizSection.vue
index 0e028cca79d..a4217cb9c4f 100644
--- a/kolibri/plugins/coach/assets/src/views/plan/CreateExamPage/CreateQuizSection.vue
+++ b/kolibri/plugins/coach/assets/src/views/plan/CreateExamPage/CreateQuizSection.vue
@@ -270,7 +270,7 @@
                           :aria-controls="`question-panel-${question.question_id}`"
                           @click="toggleItemState(question.question_id)"
                         >
-                          <span>{{ title }}</span>
+                          <span>{{ title + " " + question.counter_in_exercise }}</span>
                           <KIcon
                             style="position: absolute; right:0; top: 0.92em"
                             :icon="isItemExpanded(question.question_id) ?

From 94178e588ba7191dfd658cfdd8c9f8f4f6ca5eff Mon Sep 17 00:00:00 2001
From: Jacob Pierce <w.jacobpierce@gmail.com>
Date: Tue, 27 Feb 2024 14:35:57 -0800
Subject: [PATCH 11/67] replace import/export lost in rebase

---
 .../assets/src/views/plan/CreateExamPage/CreateQuizSection.vue  | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/kolibri/plugins/coach/assets/src/views/plan/CreateExamPage/CreateQuizSection.vue b/kolibri/plugins/coach/assets/src/views/plan/CreateExamPage/CreateQuizSection.vue
index a4217cb9c4f..522fbec9d1d 100644
--- a/kolibri/plugins/coach/assets/src/views/plan/CreateExamPage/CreateQuizSection.vue
+++ b/kolibri/plugins/coach/assets/src/views/plan/CreateExamPage/CreateQuizSection.vue
@@ -386,6 +386,7 @@
         selectAllQuestions,
 
         // Computed
+        toggleQuestionInSelection,
         channels,
         quiz,
         allSections,
@@ -420,6 +421,7 @@
         replaceAction$,
         questionList$,
 
+        toggleQuestionInSelection,
         selectAllQuestions,
         saveQuiz,
         updateSection,

From 8624302c626d08918405670d395898fc18ecf382 Mon Sep 17 00:00:00 2001
From: Jacob Pierce <w.jacobpierce@gmail.com>
Date: Tue, 27 Feb 2024 14:53:42 -0800
Subject: [PATCH 12/67] SectionEditor styles tweaks

---
 .../plan/CreateExamPage/SectionEditor.vue     | 22 +++++++++++++++----
 1 file changed, 18 insertions(+), 4 deletions(-)

diff --git a/kolibri/plugins/coach/assets/src/views/plan/CreateExamPage/SectionEditor.vue b/kolibri/plugins/coach/assets/src/views/plan/CreateExamPage/SectionEditor.vue
index d3d945dcce7..b9373a129d4 100644
--- a/kolibri/plugins/coach/assets/src/views/plan/CreateExamPage/SectionEditor.vue
+++ b/kolibri/plugins/coach/assets/src/views/plan/CreateExamPage/SectionEditor.vue
@@ -409,11 +409,13 @@
   }
 
   .section-settings-heading {
+    margin-bottom: 0.5em;
     font-size: 1em;
     font-weight: 600;
   }
 
   .section-settings-top-heading {
+    margin-bottom: 0.5em;
     font-size: 18px;
     font-weight: 600;
   }
@@ -461,13 +463,25 @@
   }
 
   .bottom-buttons-style {
-    bottom: 0;
-    margin-top: 4em;
-    margin-bottom: 1em;
+    position: absolute;
+    right: 0;
+    bottom: 1.5em;
+    left: 0;
+    padding: 1em;
+    margin-top: 1em;
+    border-top: 1px solid black;
+
+    > div {
+      padding-right: 1em;
+    }
+  }
+
+  /deep/ .textbox {
+    max-width: 100% !important;
   }
 
   .description-ktextbox-style /deep/ .ui-textbox-label {
-    width: 160%;
+    width: 100%;
   }
 
   /deep/ .KButton-noKey-0_1xktocf {

From c7c3c58810385855deb39a0aad297557c126baf6 Mon Sep 17 00:00:00 2001
From: Jacob Pierce <w.jacobpierce@gmail.com>
Date: Thu, 29 Feb 2024 13:16:29 -0800
Subject: [PATCH 13/67] checkbox cleanup in reploacement

---
 .../plan/CreateExamPage/ReplaceQuestions.vue  | 38 ++++++++++++++++++-
 1 file changed, 36 insertions(+), 2 deletions(-)

diff --git a/kolibri/plugins/coach/assets/src/views/plan/CreateExamPage/ReplaceQuestions.vue b/kolibri/plugins/coach/assets/src/views/plan/CreateExamPage/ReplaceQuestions.vue
index 8176a1a26be..9eaa37e0a05 100644
--- a/kolibri/plugins/coach/assets/src/views/plan/CreateExamPage/ReplaceQuestions.vue
+++ b/kolibri/plugins/coach/assets/src/views/plan/CreateExamPage/ReplaceQuestions.vue
@@ -45,7 +45,7 @@
               class="accordion-header"
             >
               <KCheckbox
-                style="padding-left: 0.5em"
+                class="accordion-checkbox"
                 :checked="replacements.map(q => q.id).includes(
                   question.question_id
                 )"
@@ -62,7 +62,7 @@
               >
                 <span>{{ title + " " + question.counter_in_exercise }}</span>
                 <KIcon
-                  style="position: absolute; right:0; top: 0.92em"
+                  style="position: absolute; right:1em; top: 0.625em;"
                   :icon="isItemExpanded(question.question_id) ?
                     'chevronUp' : 'chevronRight'"
                 />
@@ -268,3 +268,37 @@
   };
 
 </script>
+
+
+<style lang="scss" scoped>
+
+  .accordion-header {
+    position: relative;
+    display: flex;
+    align-items: center;
+    padding: 0;
+    margin: 0;
+    font-size: 1rem;
+    font-weight: 400;
+    line-height: 1.5;
+    text-align: left;
+    cursor: pointer;
+    user-select: none;
+    transition: background-color 0.3s ease;
+  }
+
+  .accordion-header-label {
+    display: block;
+    width: 100%;
+  }
+
+  .accordion-checkbox {
+    margin-bottom: 0;
+    margin-left: 1em;
+  }
+
+  .select-all-box {
+    margin-left: 1em;
+  }
+
+</style>

From 1dab3c1f1aed76dc7e1931003c6963455aace377 Mon Sep 17 00:00:00 2001
From: Jacob Pierce <w.jacobpierce@gmail.com>
Date: Thu, 29 Feb 2024 13:36:25 -0800
Subject: [PATCH 14/67] align "Add section" button

---
 .../views/plan/CreateExamPage/CreateQuizSection.vue  | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/kolibri/plugins/coach/assets/src/views/plan/CreateExamPage/CreateQuizSection.vue b/kolibri/plugins/coach/assets/src/views/plan/CreateExamPage/CreateQuizSection.vue
index 522fbec9d1d..bcce3df78a9 100644
--- a/kolibri/plugins/coach/assets/src/views/plan/CreateExamPage/CreateQuizSection.vue
+++ b/kolibri/plugins/coach/assets/src/views/plan/CreateExamPage/CreateQuizSection.vue
@@ -35,8 +35,8 @@
 
     <KGrid :style="tabsWrapperStyles">
       <KGridItem
-        :layout4="{ span: 3 }"
-        :layout8="{ span: 6 }"
+        :layout4="{ span: 2 }"
+        :layout8="{ span: 5 }"
         :layout12="{ span: 10 }"
       >
         <TabsWithOverflow
@@ -85,15 +85,15 @@
       </KGridItem>
 
       <KGridItem
-        style="padding: 0; margin-right: 0;"
-        :layout4="{ span: 1 }"
-        :layout8="{ span: 2 }"
+        style="position: relative; right: 0; padding: 0 0.5em 0 1em; text-align: right;"
+        :layout4="{ span: 2 }"
+        :layout8="{ span: 3 }"
         :layout12="{ span: 2 }"
       >
         <KButton
           appearance="flat-button"
           icon="plus"
-          style="height: 3rem"
+          style="height: 3rem; position: relative; right: 0; padding: 0;"
           @click="handleAddSection"
         >
           {{ addSectionLabel$() }}

From c784ee233fd5cd7e48d5424a00faf1ac13ff0bd7 Mon Sep 17 00:00:00 2001
From: Jacob Pierce <w.jacobpierce@gmail.com>
Date: Thu, 29 Feb 2024 15:24:52 -0800
Subject: [PATCH 15/67] misc style updates, fix duplicate back arrow in side
 panel

---
 .../plan/CreateExamPage/ResourceSelection.vue | 27 +++----------------
 .../plan/CreateExamPage/SectionEditor.vue     |  5 +---
 2 files changed, 4 insertions(+), 28 deletions(-)

diff --git a/kolibri/plugins/coach/assets/src/views/plan/CreateExamPage/ResourceSelection.vue b/kolibri/plugins/coach/assets/src/views/plan/CreateExamPage/ResourceSelection.vue
index 16e2fe8a3b7..b680cf38406 100644
--- a/kolibri/plugins/coach/assets/src/views/plan/CreateExamPage/ResourceSelection.vue
+++ b/kolibri/plugins/coach/assets/src/views/plan/CreateExamPage/ResourceSelection.vue
@@ -5,26 +5,9 @@
       <KCircularLoader />
     </div>
     <div v-else>
-      <KGrid class="align-select-folder-style">
-        <KGridItem
-          :layout12="{ span: 1 }"
-          :layout8="{ span: 1 }"
-        >
-          <KIconButton
-            icon="back"
-            @click="goBack()"
-          />
-        </KGridItem>
-
-        <KGridItem
-          :layout12="{ span: 11 }"
-          :layout8="{ span: 7 }"
-        >
-          <h5 class="select-folder-style">
-            {{ selectFoldersOrExercises$() }}
-          </h5>
-        </KGridItem>
-      </KGrid>
+      <h5 class="select-folder-style">
+        {{ selectFoldersOrExercises$() }}
+      </h5>
 
       <div v-if="!isTopicIdSet && bookmarks.length && !showBookmarks">
 
@@ -560,9 +543,6 @@
       focusFirstEl() {
         this.$refs.textbox.focus();
       },
-      goBack() {
-        return this.$router.go(-1);
-      },
       contentLink(content) {
         if (this.showBookmarks) {
           return this.$route;
@@ -636,7 +616,6 @@
 
   .select-resource {
     padding-bottom: 6em;
-    margin-top: -4em;
   }
 
   .title-style {
diff --git a/kolibri/plugins/coach/assets/src/views/plan/CreateExamPage/SectionEditor.vue b/kolibri/plugins/coach/assets/src/views/plan/CreateExamPage/SectionEditor.vue
index b9373a129d4..bbe4d18dd4d 100644
--- a/kolibri/plugins/coach/assets/src/views/plan/CreateExamPage/SectionEditor.vue
+++ b/kolibri/plugins/coach/assets/src/views/plan/CreateExamPage/SectionEditor.vue
@@ -415,6 +415,7 @@
   }
 
   .section-settings-top-heading {
+    margin-top: 0;
     margin-bottom: 0.5em;
     font-size: 18px;
     font-weight: 600;
@@ -492,8 +493,4 @@
     text-align: right;
   }
 
-  .section-settings-content {
-    margin-top: -50px;
-  }
-
 </style>

From d67e319fe7005219ea2025c3dfd3cd6fb8ff1a32 Mon Sep 17 00:00:00 2001
From: Jacob Pierce <w.jacobpierce@gmail.com>
Date: Sat, 2 Mar 2024 21:20:55 -0800
Subject: [PATCH 16/67] fix delete section in section editor; add

---
 .../plan/CreateExamPage/SectionEditor.vue     | 37 +++++++++++++++----
 1 file changed, 30 insertions(+), 7 deletions(-)

diff --git a/kolibri/plugins/coach/assets/src/views/plan/CreateExamPage/SectionEditor.vue b/kolibri/plugins/coach/assets/src/views/plan/CreateExamPage/SectionEditor.vue
index bbe4d18dd4d..aa5976ff408 100644
--- a/kolibri/plugins/coach/assets/src/views/plan/CreateExamPage/SectionEditor.vue
+++ b/kolibri/plugins/coach/assets/src/views/plan/CreateExamPage/SectionEditor.vue
@@ -197,7 +197,7 @@
         >
           <KButton
             :text="deleteSectionLabel$()"
-            @click="deleteSection(activeSection.section_id)"
+            @click="handleDeleteSection(activeSection.section_id)"
           />
         </KGridItem>
         <KGridItem
@@ -215,10 +215,15 @@
       </KGrid>
     </div>
     <ConfirmCancellationModal
-      v-if="showConfirmationModal"
+      v-if="showCloseConfirmation"
       @cancel="handleCancelClose"
       @continue="handleConfirmClose"
     />
+    <ConfirmCancellationModal
+      v-if="showDeleteConfirmation"
+      @cancel="handleCancelDelete"
+      @continue="handleConfirmDelete"
+    />
   </div>
 
 </template>
@@ -251,19 +256,34 @@
         allSections,
         updateSection,
         updateQuiz,
-        deleteSection,
+        removeSection,
       } = injectQuizCreation();
 
-      const showConfirmationModal = ref(false);
+      const showCloseConfirmation = ref(false);
 
       function handleCancelClose() {
-        showConfirmationModal.value = false;
+        showCloseConfirmation.value = false;
       }
 
       function handleConfirmClose() {
         context.emit('closePanel');
       }
 
+      const showDeleteConfirmation = ref(false);
+
+      function handleCancelDelete() {
+        showDeleteConfirmation.value = false;
+      }
+
+      function handleConfirmDelete() {
+        context.emit('closePanel');
+        removeSection(showDeleteConfirmation.value);
+      }
+
+      function handleDeleteSection(section_id) {
+        showDeleteConfirmation.value = section_id;
+      }
+
       /* Note that the use of snake_case here is to map directly to the API */
       const learners_see_fixed_order = ref(activeSection.value.learners_see_fixed_order);
       const question_count = ref(activeSection.value.question_count);
@@ -310,15 +330,18 @@
 
       return {
         formDataHasChanged,
-        showConfirmationModal,
+        showCloseConfirmation,
+        showDeleteConfirmation,
         handleCancelClose,
         handleConfirmClose,
+        handleCancelDelete,
+        handleConfirmDelete,
         // useQuizCreation
         activeSection,
         allSections,
         updateSection,
         updateQuiz,
-        deleteSection,
+        handleDeleteSection,
         // Form models
         learners_see_fixed_order,
         question_count,

From 6cb417d4369e3e482e191fd938ca8b41d15bb571 Mon Sep 17 00:00:00 2001
From: Jacob Pierce <w.jacobpierce@gmail.com>
Date: Sat, 2 Mar 2024 21:33:01 -0800
Subject: [PATCH 17/67] update & clean-up strings; replace
 ConfirmCancellationModal w/ KModals

---
 .../ConfirmCancellationModal.vue              | 61 -----------------
 .../plan/CreateExamPage/ReplaceQuestions.vue  | 34 ++++++----
 .../plan/CreateExamPage/ResourceSelection.vue | 25 +++----
 .../plan/CreateExamPage/SectionEditor.vue     | 50 +++++++-------
 .../plan/CreateExamPage/SectionSidePanel.vue  | 66 ++++++++++---------
 .../strings/enhancedQuizManagementStrings.js  | 16 +++++
 6 files changed, 115 insertions(+), 137 deletions(-)
 delete mode 100644 kolibri/plugins/coach/assets/src/views/plan/CreateExamPage/ConfirmCancellationModal.vue

diff --git a/kolibri/plugins/coach/assets/src/views/plan/CreateExamPage/ConfirmCancellationModal.vue b/kolibri/plugins/coach/assets/src/views/plan/CreateExamPage/ConfirmCancellationModal.vue
deleted file mode 100644
index e60e3640bb0..00000000000
--- a/kolibri/plugins/coach/assets/src/views/plan/CreateExamPage/ConfirmCancellationModal.vue
+++ /dev/null
@@ -1,61 +0,0 @@
-<template>
-
-  <div>
-    <KModal
-      title="Are you sure you want to exit ?"
-    >
-      <p>All the changes made on selected resource will be lost</p>
-
-      <template #actions>
-        <KGrid>
-          <KGridItem
-            :layout12="{ span: 6 }"
-            :layout8="{ span: 4 }"
-            :layout4="{ span: 2 }"
-          >
-            <KButton
-              :text="coreString('cancelAction')"
-              class="kbuttons"
-              style="width:100%;"
-              @click="closeModal()"
-            />
-          </KGridItem>
-          <KGridItem
-            :layout12="{ span: 6 }"
-            :layout8="{ span: 4 }"
-            :layout4="{ span: 2 }"
-          >
-            <KButton
-              :text="coreString('continueAction')"
-              appearance="raised-button"
-              style="width:100%;"
-              primary
-              @click="handleContinueAction"
-            />
-          </KGridItem>
-        </KGrid>
-      </template>
-    </KModal>
-  </div>
-
-</template>
-
-
-<script>
-
-  import commonCoreStrings from 'kolibri.coreVue.mixins.commonCoreStrings';
-
-  export default {
-    name: 'ConfirmCancellationModal',
-    mixins: [commonCoreStrings],
-    methods: {
-      handleContinueAction() {
-        this.$emit('continue');
-      },
-      closeModal() {
-        this.$emit('cancel');
-      },
-    },
-  };
-
-</script>
diff --git a/kolibri/plugins/coach/assets/src/views/plan/CreateExamPage/ReplaceQuestions.vue b/kolibri/plugins/coach/assets/src/views/plan/CreateExamPage/ReplaceQuestions.vue
index 9eaa37e0a05..b7ef1dfac4c 100644
--- a/kolibri/plugins/coach/assets/src/views/plan/CreateExamPage/ReplaceQuestions.vue
+++ b/kolibri/plugins/coach/assets/src/views/plan/CreateExamPage/ReplaceQuestions.vue
@@ -125,11 +125,16 @@
         </KGridItem>
       </KGrid>
     </div>
-    <ConfirmCancellationModal
-      v-if="showConfirmationModal"
+    <KModal
+      v-if="showCloseConfirmation"
+      :submitText="coreString('continueAction')"
+      :cancelText="coreString('cancelAction')"
+      :title="closeConfirmationTitle$()"
       @cancel="handleCancelClose"
-      @continue="handleConfirmClose"
-    />
+      @submit="handleConfirmClose"
+    >
+      {{ closeConfirmationMessage$() }}
+    </KModal>
   </div>
 
 </template>
@@ -140,24 +145,26 @@
   import { enhancedQuizManagementStrings } from 'kolibri-common/strings/enhancedQuizManagementStrings';
   import { computed, ref } from 'kolibri.lib.vueCompositionApi';
   import { get } from '@vueuse/core';
+  import commonCoreStrings from 'kolibri.coreVue.mixins.commonCoreStrings';
   import { injectQuizCreation } from '../../../composables/useQuizCreation';
   import AccordionItem from './AccordionItem';
   import AccordionContainer from './AccordionContainer';
-  import ConfirmCancellationModal from './ConfirmCancellationModal';
 
   export default {
     name: 'ReplaceQuestions',
     components: {
       AccordionContainer,
       AccordionItem,
-      ConfirmCancellationModal,
     },
+    mixins: [commonCoreStrings],
     setup(_, context) {
       const {
         replaceQuestions$,
         deleteSectionLabel$,
         replaceAction$,
         selectAllLabel$,
+        closeConfirmationMessage$,
+        closeConfirmationTitle$,
         replaceQuestionsExplaination$,
         numberOfSelectedReplacements$,
       } = enhancedQuizManagementStrings;
@@ -177,10 +184,10 @@
         updateSection,
       } = injectQuizCreation();
 
-      const showConfirmationModal = ref(false);
+      const showCloseConfirmation = ref(false);
 
       function handleCancelClose() {
-        showConfirmationModal.value = false;
+        showCloseConfirmation.value = false;
       }
 
       function handleConfirmClose() {
@@ -230,8 +237,8 @@
         selectAllIsIndeterminate,
         replaceSelectedQuestions,
         activeResourceMap,
+        showCloseConfirmation,
 
-        showConfirmationModal,
         handleCancelClose,
         handleConfirmClose,
         clearSelectedQuestions,
@@ -245,6 +252,8 @@
         selectAllLabel$,
         replaceQuestionsExplaination$,
         numberOfSelectedReplacements$,
+        closeConfirmationMessage$,
+        closeConfirmationTitle$,
       };
     },
     computed: {
@@ -258,8 +267,11 @@
       },
     },
     beforeRouteLeave(_, __, next) {
-      if (!this.showConfirmationModal && this.formDataHasChanged) {
-        this.showConfirmationModal = true;
+      if (
+        !this.showCloseConfirmation &&
+        this.replacements.length !== this.selectedActiveQuestions.length
+      ) {
+        this.showCloseConfirmation = true;
         next(false);
       } else {
         next();
diff --git a/kolibri/plugins/coach/assets/src/views/plan/CreateExamPage/ResourceSelection.vue b/kolibri/plugins/coach/assets/src/views/plan/CreateExamPage/ResourceSelection.vue
index b680cf38406..382353f249b 100644
--- a/kolibri/plugins/coach/assets/src/views/plan/CreateExamPage/ResourceSelection.vue
+++ b/kolibri/plugins/coach/assets/src/views/plan/CreateExamPage/ResourceSelection.vue
@@ -95,11 +95,16 @@
         </KGrid>
       </div>
     </div>
-    <ConfirmCancellationModal
-      v-if="showConfirmationModal"
+    <KModal
+      v-if="showCloseConfirmation"
+      submitText="YES CLOSE IT"
+      cancelText="CANCEL"
+      title="CLOSE PANEL"
       @cancel="handleCancelClose"
-      @continue="handleConfirmClose"
-    />
+      @submit="handleConfirmClose"
+    >
+      yes?
+    </KModal>
   </div>
 
 </template>
@@ -121,7 +126,6 @@
   import { injectQuizCreation } from '../../../composables/useQuizCreation';
   import LessonsSearchBox from '../LessonResourceSelectionPage/SearchTools/LessonsSearchBox.vue';
   import ContentCardList from './../LessonResourceSelectionPage/ContentCardList.vue';
-  import ConfirmCancellationModal from './ConfirmCancellationModal.vue';
   import ResourceSelectionBreadcrumbs from './../LessonResourceSelectionPage/SearchTools/ResourceSelectionBreadcrumbs.vue';
 
   export default {
@@ -131,7 +135,6 @@
       BookmarkIcon,
       LessonsSearchBox,
       ResourceSelectionBreadcrumbs,
-      ConfirmCancellationModal,
     },
     mixins: [commonCoreStrings],
     setup(_, context) {
@@ -144,7 +147,7 @@
       const showBookmarks = computed(() => route.value.query.showBookmarks);
       const searchQuery = computed(() => route.value.query.search);
       const { updateSection, activeResourcePool, selectAllQuestions } = injectQuizCreation();
-      const showConfirmationModal = ref(false);
+      const showCloseConfirmation = ref(false);
 
       const prevRoute = ref({ name: PageNames.EXAM_CREATION_ROOT });
 
@@ -431,7 +434,7 @@
       }
 
       function handleCancelClose() {
-        showConfirmationModal.value = false;
+        showCloseConfirmation.value = false;
       }
 
       function handleConfirmClose() {
@@ -459,7 +462,7 @@
         topicId,
         contentList,
         resources,
-        showConfirmationModal,
+        showCloseConfirmation,
         hasCheckbox,
         loading,
         hasMore,
@@ -525,8 +528,8 @@
       });
     },
     beforeRouteLeave(_, __, next) {
-      if (!this.showConfirmationModal && this.workingPoolHasChanged) {
-        this.showConfirmationModal = true;
+      if (!this.showCloseConfirmation && this.workingPoolHasChanged) {
+        this.showCloseConfirmation = true;
         next(false);
       } else {
         next();
diff --git a/kolibri/plugins/coach/assets/src/views/plan/CreateExamPage/SectionEditor.vue b/kolibri/plugins/coach/assets/src/views/plan/CreateExamPage/SectionEditor.vue
index aa5976ff408..d64fc0ecb26 100644
--- a/kolibri/plugins/coach/assets/src/views/plan/CreateExamPage/SectionEditor.vue
+++ b/kolibri/plugins/coach/assets/src/views/plan/CreateExamPage/SectionEditor.vue
@@ -214,16 +214,26 @@
         </KGridItem>
       </KGrid>
     </div>
-    <ConfirmCancellationModal
+    <KModal
       v-if="showCloseConfirmation"
+      :submitText="coreString('continueAction')"
+      :cancelText="coreString('cancelAction')"
+      :title="closeConfirmationTitle$()"
       @cancel="handleCancelClose"
-      @continue="handleConfirmClose"
-    />
-    <ConfirmCancellationModal
+      @submit="handleConfirmClose"
+    >
+      {{ closeConfirmationMessage$() }}
+    </KModal>
+    <KModal
       v-if="showDeleteConfirmation"
+      :title="deleteSectionLabel$()"
+      :submitText="coreString('deleteAction')"
+      :cancelText="coreString('cancelAction')"
       @cancel="handleCancelDelete"
-      @continue="handleConfirmDelete"
-    />
+      @submit="handleConfirmDelete"
+    >
+      {{ deleteConfirmation$({ section_title: activeSection.section_title }) }}
+    </KModal>
   </div>
 
 </template>
@@ -235,21 +245,21 @@
   import pick from 'lodash/pick';
   import { computed, ref } from 'kolibri.lib.vueCompositionApi';
   import { enhancedQuizManagementStrings } from 'kolibri-common/strings/enhancedQuizManagementStrings';
+  import commonCoreStrings from 'kolibri.coreVue.mixins.commonCoreStrings';
   import useKResponsiveWindow from 'kolibri-design-system/lib/useKResponsiveWindow';
   import Draggable from 'kolibri.coreVue.components.Draggable';
   import DragContainer from 'kolibri.coreVue.components.DragContainer';
   import DragHandle from 'kolibri.coreVue.components.DragHandle';
   import { injectQuizCreation } from '../../../composables/useQuizCreation';
-  import ConfirmCancellationModal from './ConfirmCancellationModal.vue';
 
   export default {
     name: 'SectionEditor',
     components: {
-      ConfirmCancellationModal,
       Draggable,
       DragContainer,
       DragHandle,
     },
+    mixins: [commonCoreStrings],
     setup(_, context) {
       const {
         activeSection,
@@ -276,8 +286,8 @@
       }
 
       function handleConfirmDelete() {
-        context.emit('closePanel');
         removeSection(showDeleteConfirmation.value);
+        context.emit('closePanel');
       }
 
       function handleDeleteSection(section_id) {
@@ -326,6 +336,9 @@
         randomizedOptionDescription$,
         fixedLabel$,
         fixedOptionDescription$,
+        closeConfirmationMessage$,
+        closeConfirmationTitle$,
+        deleteConfirmation$,
       } = enhancedQuizManagementStrings;
 
       return {
@@ -360,6 +373,9 @@
         currentSection$,
         deleteSectionLabel$,
         applySettings$,
+        closeConfirmationTitle$,
+        closeConfirmationMessage$,
+        deleteConfirmation$,
         changeResources$,
         sectionOrder$,
         questionOrder$,
@@ -394,9 +410,9 @@
         };
       },
     },
-    beforeRouteLeave(_, __, next) {
-      if (!this.showConfirmationModal && this.formDataHasChanged) {
-        this.showConfirmationModal = true;
+    beforeRouteLeave(to, __, next) {
+      if (!this.showCloseConfirmation && this.formDataHasChanged && !this.showDeleteConfirmation) {
+        this.showCloseConfirmation = true;
         next(false);
       } else {
         next();
@@ -472,12 +488,6 @@
     float: right;
   }
 
-  .change-resource-button-style {
-    display: block;
-    width: 100%;
-    margin-bottom: 1.5em;
-  }
-
   .section-order-style {
     font-size: 1em;
   }
@@ -508,10 +518,6 @@
     width: 100%;
   }
 
-  /deep/ .KButton-noKey-0_1xktocf {
-    width: 100%;
-  }
-
   .current-section-text {
     text-align: right;
   }
diff --git a/kolibri/plugins/coach/assets/src/views/plan/CreateExamPage/SectionSidePanel.vue b/kolibri/plugins/coach/assets/src/views/plan/CreateExamPage/SectionSidePanel.vue
index debfaf40b46..7cb22aca09c 100644
--- a/kolibri/plugins/coach/assets/src/views/plan/CreateExamPage/SectionSidePanel.vue
+++ b/kolibri/plugins/coach/assets/src/views/plan/CreateExamPage/SectionSidePanel.vue
@@ -5,7 +5,7 @@
     ref="resourcePanel"
     alignment="right"
     sidePanelWidth="700px"
-    :closeButtonIconType="closeIcon"
+    :closeButtonIconType="closeBackIcon"
     @closePanel="handleClosePanel"
     @shouldFocusFirstEl="findFirstEl()"
   >
@@ -18,7 +18,7 @@
 <script>
 
   import SidePanelModal from 'kolibri-common/components/SidePanelModal';
-  import { computed, getCurrentInstance } from 'kolibri.lib.vueCompositionApi';
+  import { ref, watch, computed, getCurrentInstance } from 'kolibri.lib.vueCompositionApi';
   import logging from 'kolibri.lib.logging';
   import { injectQuizCreation } from '../../../composables/useQuizCreation';
   import { PageNames } from '../../../constants';
@@ -37,13 +37,37 @@
       const route = computed(() => store.state.route);
       const section_id = computed(() => route.value.params.section_id);
 
+      const routeWhenSidePanelOpened = route.value;
+      const prevRoute = ref({ name: PageNames.EXAM_CREATION_ROOT });
+      const canCloseSidePanel = ref(true);
+
+      watch(route, (to, from) => {
+        // We're on the same route we were on when we started so should be able to close it
+        canCloseSidePanel.value = to.name === routeWhenSidePanelOpened.name;
+        prevRoute.value = from;
+      });
+
       function handleClosePanel() {
-        router.push({
-          name: PageNames.EXAM_CREATION_ROOT,
-          params: { section_id: null },
-        });
+        if (canCloseSidePanel.value) {
+          // Avoid redundant navigation error
+          if (prevRoute.value.name === PageNames.EXAM_CREATION_ROOT) {
+            router.back();
+          } else {
+            router.push({ name: PageNames.EXAM_CREATION_ROOT });
+          }
+        } else {
+          router.back();
+        }
       }
 
+      const closeBackIcon = computed(() => {
+        if (canCloseSidePanel.value) {
+          return 'close';
+        } else {
+          return 'back';
+        }
+      });
+
       /**
        * Avoids flashing the side panel when we're going to just hide it anyway.
        */
@@ -51,40 +75,18 @@
 
       if (section_id.value !== activeSection.value.section_id) {
         logger.warn("Section ID doesn't match active section ID, forcing close of side panel.");
-        handleClosePanel();
+        router.push({ name: PageNames.EXAM_CREATION_ROOT });
       } else {
         showSidePanel = true;
       }
+
       return {
         showSidePanel,
+        canCloseSidePanel,
+        closeBackIcon,
         handleClosePanel,
       };
     },
-    data() {
-      return {
-        prevRoute: { name: PageNames.EXAM_CREATION_ROOT },
-      };
-    },
-    computed: {
-      /**
-       * When the previous route was the root page OR select resources, we want an X icon.
-       * Otherwise, we want a back icon.
-       * X  means "close this side panel"
-       * <- means "go back to last view of this panel" - which we only want when we were selecting
-       *           resources.
-       */
-      closeIcon() {
-        return this.prevRoute.name === PageNames.EXAM_CREATION_ROOT ||
-          this.prevRoute.name === PageNames.QUIZ_SELECT_RESOURCES
-          ? 'close'
-          : 'back';
-      },
-    },
-    watch: {
-      $route: function(_, from) {
-        this.prevRoute = from;
-      },
-    },
     methods: {
       /**
        * Calls the currently displayed ref's focusFirstEl method.
diff --git a/packages/kolibri-common/strings/enhancedQuizManagementStrings.js b/packages/kolibri-common/strings/enhancedQuizManagementStrings.js
index f72e5bbd278..0733cb5fd5b 100644
--- a/packages/kolibri-common/strings/enhancedQuizManagementStrings.js
+++ b/packages/kolibri-common/strings/enhancedQuizManagementStrings.js
@@ -135,6 +135,22 @@ export const enhancedQuizManagementStrings = createTranslator('EnhancedQuizManag
   reviewSelectedResources: {
     message: 'Review selected resources',
   },
+  deleteConfirmation: {
+    message: "Are you sure you want to delete section '{section_title}'?",
+    context:
+      'A warning message that appears when the user tries to leave the page without saving their work',
+  },
+  closeConfirmationTitle: {
+    message: 'Are you sure you want to leave this page?',
+    context:
+      'The title of a confirmation modal informing the user that they will lose their work if they leave the page',
+  },
+  closeConfirmationMessage: {
+    message: 'You will lose any unsaved edits to your work',
+    context:
+      'The body of a confirmation modal informing the user that they will lose their work if they leave the page',
+  },
+
   numberOfSelectedResources: {
     message:
       '{ count, number } { count, plural, one { resource selected } other { resources selected }} from { count, number } { count, plural, one { channel } other { channels }}',

From 5e89cd5e305c1b78f416d0f42ba7f12503df0533 Mon Sep 17 00:00:00 2001
From: Jacob Pierce <w.jacobpierce@gmail.com>
Date: Sat, 2 Mar 2024 21:56:31 -0800
Subject: [PATCH 18/67] back arrow & x on resource selection

---
 .../src/views/plan/CreateExamPage/SectionSidePanel.vue   | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/kolibri/plugins/coach/assets/src/views/plan/CreateExamPage/SectionSidePanel.vue b/kolibri/plugins/coach/assets/src/views/plan/CreateExamPage/SectionSidePanel.vue
index 7cb22aca09c..bfca8bd5fee 100644
--- a/kolibri/plugins/coach/assets/src/views/plan/CreateExamPage/SectionSidePanel.vue
+++ b/kolibri/plugins/coach/assets/src/views/plan/CreateExamPage/SectionSidePanel.vue
@@ -43,7 +43,14 @@
 
       watch(route, (to, from) => {
         // We're on the same route we were on when we started so should be able to close it
-        canCloseSidePanel.value = to.name === routeWhenSidePanelOpened.name;
+        canCloseSidePanel.value =
+          to.name === routeWhenSidePanelOpened.name &&
+          // I tried using _.isEqual on the params & query objects but it didn't work as I expected
+          // so this is hard-coded for now.
+          to.params.section_id === routeWhenSidePanelOpened.params.section_id &&
+          to.params.topic_id === routeWhenSidePanelOpened.params.topic_id &&
+          to.query.showBookmarks === routeWhenSidePanelOpened.query.showBookmarks &&
+          to.query.search === routeWhenSidePanelOpened.query.search;
         prevRoute.value = from;
       });
 

From dd80271fd728c3dbcad459e9e54f7e78f2a8e3e6 Mon Sep 17 00:00:00 2001
From: Jacob Pierce <w.jacobpierce@gmail.com>
Date: Sun, 3 Mar 2024 22:29:27 -0800
Subject: [PATCH 19/67] basic general snackbar messages

---
 .../plan/CreateExamPage/ReplaceQuestions.vue     | 16 +++++++++++++---
 .../plan/CreateExamPage/ResourceSelection.vue    | 13 +++++++++----
 .../views/plan/CreateExamPage/SectionEditor.vue  |  3 +++
 .../src/views/plan/CreateExamPage/index.vue      | 11 +++++++++++
 4 files changed, 36 insertions(+), 7 deletions(-)

diff --git a/kolibri/plugins/coach/assets/src/views/plan/CreateExamPage/ReplaceQuestions.vue b/kolibri/plugins/coach/assets/src/views/plan/CreateExamPage/ReplaceQuestions.vue
index b7ef1dfac4c..76518afb9ff 100644
--- a/kolibri/plugins/coach/assets/src/views/plan/CreateExamPage/ReplaceQuestions.vue
+++ b/kolibri/plugins/coach/assets/src/views/plan/CreateExamPage/ReplaceQuestions.vue
@@ -143,10 +143,11 @@
 <script>
 
   import { enhancedQuizManagementStrings } from 'kolibri-common/strings/enhancedQuizManagementStrings';
-  import { computed, ref } from 'kolibri.lib.vueCompositionApi';
+  import { getCurrentInstance, computed, ref } from 'kolibri.lib.vueCompositionApi';
   import { get } from '@vueuse/core';
   import commonCoreStrings from 'kolibri.coreVue.mixins.commonCoreStrings';
   import { injectQuizCreation } from '../../../composables/useQuizCreation';
+  import { PageNames } from '../../../constants/index';
   import AccordionItem from './AccordionItem';
   import AccordionContainer from './AccordionContainer';
 
@@ -158,6 +159,7 @@
     },
     mixins: [commonCoreStrings],
     setup(_, context) {
+      const router = getCurrentInstance().proxy.$router;
       const {
         replaceQuestions$,
         deleteSectionLabel$,
@@ -167,6 +169,7 @@
         closeConfirmationTitle$,
         replaceQuestionsExplaination$,
         numberOfSelectedReplacements$,
+        numberOfQuestionsReplaced$,
       } = enhancedQuizManagementStrings;
       const {
         // Computed
@@ -197,6 +200,7 @@
       const replacements = ref([]);
 
       function handleReplacement() {
+        const count = replacements.value.length;
         const questionsNotSelectedToBeReplaced = activeQuestions.value.filter(
           question => !selectedActiveQuestions.value.includes(question.question_id)
         );
@@ -204,8 +208,12 @@
           section_id: activeSection.value.section_id,
           questions: [...questionsNotSelectedToBeReplaced, ...replacements.value],
         });
-        clearSelectedQuestions();
-        context.emit('closePanel');
+        router.replace({
+          name: PageNames.EXAM_CREATION_ROOT,
+          query: {
+            snackbar: numberOfQuestionsReplaced$({ count }),
+          },
+        });
       }
 
       function toggleInReplacements(question) {
@@ -269,11 +277,13 @@
     beforeRouteLeave(_, __, next) {
       if (
         !this.showCloseConfirmation &&
+        this.replacements.length &&
         this.replacements.length !== this.selectedActiveQuestions.length
       ) {
         this.showCloseConfirmation = true;
         next(false);
       } else {
+        this.clearSelectedQuestions();
         next();
       }
     },
diff --git a/kolibri/plugins/coach/assets/src/views/plan/CreateExamPage/ResourceSelection.vue b/kolibri/plugins/coach/assets/src/views/plan/CreateExamPage/ResourceSelection.vue
index 382353f249b..b4183bdb2ea 100644
--- a/kolibri/plugins/coach/assets/src/views/plan/CreateExamPage/ResourceSelection.vue
+++ b/kolibri/plugins/coach/assets/src/views/plan/CreateExamPage/ResourceSelection.vue
@@ -77,7 +77,7 @@
             :layout8="{ span: 4 }"
             :layout4="{ span: 2 }"
           >
-            <span>{{ numberOfResources$({ count: workingResourcePool.length }) }}</span>
+            <span>{{ numberOfResourcesSelected$({ count: workingResourcePool.length }) }}</span>
           </KGridItem>
           <KGridItem
             :layout12="{ span: 6 }"
@@ -157,7 +157,8 @@
         numberOfSelectedBookmarks$,
         selectFoldersOrExercises$,
         numberOfSelectedResources$,
-        numberOfResources$,
+        numberOfResourcesSelected$,
+        changesSavedSuccessfully$,
         selectedResourcesInformation$,
         cannotSelectSomeTopicWarning$,
       } = enhancedQuizManagementStrings;
@@ -472,12 +473,13 @@
         contentPresentInWorkingResourcePool,
         //contentList,
         cannotSelectSomeTopicWarning$,
+        changesSavedSuccessfully$,
         sectionSettings$,
         selectFromBookmarks$,
         numberOfSelectedBookmarks$,
         selectFoldersOrExercises$,
         numberOfSelectedResources$,
-        numberOfResources$,
+        numberOfResourcesSelected$,
         windowIsSmall,
         bookmarks,
         channels,
@@ -574,7 +576,10 @@
         //Also reset workingResourcePool
         this.resetWorkingResourcePool();
 
-        this.$router.replace(this.prevRoute);
+        this.$router.replace({
+          ...this.prevRoute,
+          ...{ query: { snackbar: this.changesSavedSuccessfully$() } },
+        });
       },
       selectionMetadata(content) {
         if (content.kind === ContentNodeKinds.TOPIC) {
diff --git a/kolibri/plugins/coach/assets/src/views/plan/CreateExamPage/SectionEditor.vue b/kolibri/plugins/coach/assets/src/views/plan/CreateExamPage/SectionEditor.vue
index d64fc0ecb26..760c68623f5 100644
--- a/kolibri/plugins/coach/assets/src/views/plan/CreateExamPage/SectionEditor.vue
+++ b/kolibri/plugins/coach/assets/src/views/plan/CreateExamPage/SectionEditor.vue
@@ -339,6 +339,7 @@
         closeConfirmationMessage$,
         closeConfirmationTitle$,
         deleteConfirmation$,
+        changesSavedSuccessfully$,
       } = enhancedQuizManagementStrings;
 
       return {
@@ -373,6 +374,7 @@
         currentSection$,
         deleteSectionLabel$,
         applySettings$,
+        changesSavedSuccessfully$,
         closeConfirmationTitle$,
         closeConfirmationMessage$,
         deleteConfirmation$,
@@ -430,6 +432,7 @@
           question_count: this.question_count,
           learners_see_fixed_order: this.learners_see_fixed_order,
         });
+        this.$store.dispatch('createSnackbar', this.changesSavedSuccessfully$());
       },
     },
   };
diff --git a/kolibri/plugins/coach/assets/src/views/plan/CreateExamPage/index.vue b/kolibri/plugins/coach/assets/src/views/plan/CreateExamPage/index.vue
index 6fbfd15fce6..0eea03e9306 100644
--- a/kolibri/plugins/coach/assets/src/views/plan/CreateExamPage/index.vue
+++ b/kolibri/plugins/coach/assets/src/views/plan/CreateExamPage/index.vue
@@ -99,6 +99,17 @@
         });
       },
     },
+    beforeRouteUpdate(to, from, next) {
+      // Handle snackbar query param and show message - particularly for when closing the side panel
+      // and saying "Action Succeeded"
+      if (to.query.snackbar) {
+        this.$store.dispatch('createSnackbar', to.query.snackbar).then(() => {
+          delete to.query.snackbar;
+          next(to);
+        });
+      }
+      next();
+    },
     mounted() {
       this.$store.dispatch('notLoading');
     },

From 1f7f9bee6feb5c7a7cc12a6bd211a17f4d2ae7cd Mon Sep 17 00:00:00 2001
From: Jacob Pierce <w.jacobpierce@gmail.com>
Date: Sun, 3 Mar 2024 22:29:38 -0800
Subject: [PATCH 20/67] additional snackbar message

---
 .../kolibri-common/strings/enhancedQuizManagementStrings.js | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/packages/kolibri-common/strings/enhancedQuizManagementStrings.js b/packages/kolibri-common/strings/enhancedQuizManagementStrings.js
index 0733cb5fd5b..8ef8138df40 100644
--- a/packages/kolibri-common/strings/enhancedQuizManagementStrings.js
+++ b/packages/kolibri-common/strings/enhancedQuizManagementStrings.js
@@ -163,7 +163,7 @@ export const enhancedQuizManagementStrings = createTranslator('EnhancedQuizManag
     message:
       '{ count, number } { count, plural, one { question successfully replaced } other { questions successfully replaced }} ',
   },
-  numberOfResources: {
+  numberOfResourcesSelected: {
     message: '{count, number} {count, plural, one {resource selected} other {resources selected}}',
   },
   selectedResourcesInformation: {
@@ -174,4 +174,8 @@ export const enhancedQuizManagementStrings = createTranslator('EnhancedQuizManag
     message:
       'You can only select folders with 12 or less exercises and no subfolders to avoid oversized quizzes.',
   },
+  changesSavedSuccessfully: {
+    message: 'Changes saved successfully',
+    context: 'A snackbar message that appears when the user saves their changes',
+  },
 });

From 9b991bfaa44765ba76ad758dc036abb2963bea97 Mon Sep 17 00:00:00 2001
From: Jacob Pierce <w.jacobpierce@gmail.com>
Date: Sun, 3 Mar 2024 22:34:45 -0800
Subject: [PATCH 21/67] ensure "no results" message shows when search yields
 nothing

---
 .../plan/LessonResourceSelectionPage/ContentCardList.vue    | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/kolibri/plugins/coach/assets/src/views/plan/LessonResourceSelectionPage/ContentCardList.vue b/kolibri/plugins/coach/assets/src/views/plan/LessonResourceSelectionPage/ContentCardList.vue
index ffc72b8e6c3..f2a4ce7ae93 100644
--- a/kolibri/plugins/coach/assets/src/views/plan/LessonResourceSelectionPage/ContentCardList.vue
+++ b/kolibri/plugins/coach/assets/src/views/plan/LessonResourceSelectionPage/ContentCardList.vue
@@ -57,9 +57,9 @@
         <KIcon icon="error" />
         <!-- {{ $tr('moreResultsError') }} -->
       </p>
-      <!-- <p v-else-if="viewMoreButtonState === 'no_more_results'">
-        {{ $tr('noMoreResults') }}
-      </p> -->
+      <p v-else-if="contentList.length === 0">
+        {{ coreString('noResultsLabel') }}
+      </p>
     </template>
   </div>
 

From 1bce015092f72603082f69068f432493327af3d7 Mon Sep 17 00:00:00 2001
From: Jacob Pierce <w.jacobpierce@gmail.com>
Date: Sun, 3 Mar 2024 23:25:21 -0800
Subject: [PATCH 22/67] fix missing styles on bottom-nav of replace questions;
 snackbars for delete

---
 .../plan/CreateExamPage/CreateQuizSection.vue | 20 +++++-
 .../plan/CreateExamPage/ReplaceQuestions.vue  | 25 +++++++-
 .../plan/CreateExamPage/SectionEditor.vue     | 61 +++++++++++--------
 .../strings/enhancedQuizManagementStrings.js  |  4 ++
 4 files changed, 81 insertions(+), 29 deletions(-)

diff --git a/kolibri/plugins/coach/assets/src/views/plan/CreateExamPage/CreateQuizSection.vue b/kolibri/plugins/coach/assets/src/views/plan/CreateExamPage/CreateQuizSection.vue
index bcce3df78a9..4e07a9d3cfc 100644
--- a/kolibri/plugins/coach/assets/src/views/plan/CreateExamPage/CreateQuizSection.vue
+++ b/kolibri/plugins/coach/assets/src/views/plan/CreateExamPage/CreateQuizSection.vue
@@ -366,6 +366,7 @@
         deleteSectionLabel$,
         replaceAction$,
         questionList$,
+        sectionDeletedNotification$,
       } = enhancedQuizManagementStrings;
 
       const {
@@ -420,6 +421,7 @@
         deleteSectionLabel$,
         replaceAction$,
         questionList$,
+        sectionDeletedNotification$,
 
         toggleQuestionInSelection,
         selectAllQuestions,
@@ -505,6 +507,13 @@
         ];
       },
     },
+    created() {
+      const { query } = this.$route;
+      if (query.snackbar) {
+        delete query.snackbar;
+        this.$router.replace({ query: { snackbar: null } });
+      }
+    },
     methods: {
       handleReplaceSelection() {
         const section_id = get(this.activeSection).section_id;
@@ -513,14 +522,21 @@
       },
       handleActiveSectionAction(opt) {
         const section_id = this.activeSection.section_id;
+        const section_title = this.activeSection.section_title;
         const editRoute = this.$router.getRoute(PageNames.QUIZ_SECTION_EDITOR, { section_id });
         switch (opt.label) {
           case this.editSectionLabel$():
             this.$router.push(editRoute);
             break;
           case this.deleteSectionLabel$():
-            this.removeSection(this.activeSection.section_id);
-            this.focusActiveSectionTab();
+            this.removeSection(section_id);
+            this.$nextTick(() => {
+              this.$store.dispatch(
+                'createSnackbar',
+                this.sectionDeletedNotification$({ section_title })
+              );
+              this.focusActiveSectionTab();
+            });
             break;
         }
       },
diff --git a/kolibri/plugins/coach/assets/src/views/plan/CreateExamPage/ReplaceQuestions.vue b/kolibri/plugins/coach/assets/src/views/plan/CreateExamPage/ReplaceQuestions.vue
index 76518afb9ff..09da3e05272 100644
--- a/kolibri/plugins/coach/assets/src/views/plan/CreateExamPage/ReplaceQuestions.vue
+++ b/kolibri/plugins/coach/assets/src/views/plan/CreateExamPage/ReplaceQuestions.vue
@@ -1,6 +1,6 @@
 <template>
 
-  <div>
+  <div class="wrapper">
     <h1 class="section-header" :style="{ color: `${$themeTokens.annotation}` }">
       {{ activeSection.section_title }}
     </h1>
@@ -96,7 +96,7 @@
         </AccordionItem>
       </template>
     </AccordionContainer>
-    <div class="bottom-buttons-style">
+    <div class="bottom-navigation">
       <KGrid>
         <KGridItem
           style="text-align: left;"
@@ -314,6 +314,27 @@
     width: 100%;
   }
 
+  .wrapper {
+    // Accounts for height of .bottom-navigation
+    padding-bottom: 6em;
+  }
+
+  .bottom-navigation {
+    position: absolute;
+    right: 0;
+    bottom: 1.5em;
+    left: 0;
+    width: 100%;
+    padding: 1em;
+    text-align: center;
+    background-color: white;
+    border-top: 1px solid black;
+
+    div {
+      line-height: 2.5em;
+    }
+  }
+
   .accordion-checkbox {
     margin-bottom: 0;
     margin-left: 1em;
diff --git a/kolibri/plugins/coach/assets/src/views/plan/CreateExamPage/SectionEditor.vue b/kolibri/plugins/coach/assets/src/views/plan/CreateExamPage/SectionEditor.vue
index 760c68623f5..70cb6dbe39f 100644
--- a/kolibri/plugins/coach/assets/src/views/plan/CreateExamPage/SectionEditor.vue
+++ b/kolibri/plugins/coach/assets/src/views/plan/CreateExamPage/SectionEditor.vue
@@ -199,8 +199,10 @@
             :text="deleteSectionLabel$()"
             @click="handleDeleteSection(activeSection.section_id)"
           />
+
         </KGridItem>
         <KGridItem
+          style="text-align: right;"
           :layout12="{ span: 8 }"
           :layout8="{ span: 6 }"
           :layout4="{ span: 3 }"
@@ -243,13 +245,14 @@
 
   import isEqual from 'lodash/isEqual';
   import pick from 'lodash/pick';
-  import { computed, ref } from 'kolibri.lib.vueCompositionApi';
+  import { getCurrentInstance, computed, ref } from 'kolibri.lib.vueCompositionApi';
   import { enhancedQuizManagementStrings } from 'kolibri-common/strings/enhancedQuizManagementStrings';
   import commonCoreStrings from 'kolibri.coreVue.mixins.commonCoreStrings';
   import useKResponsiveWindow from 'kolibri-design-system/lib/useKResponsiveWindow';
   import Draggable from 'kolibri.coreVue.components.Draggable';
   import DragContainer from 'kolibri.coreVue.components.DragContainer';
   import DragHandle from 'kolibri.coreVue.components.DragHandle';
+  import { PageNames } from '../../../constants/index';
   import { injectQuizCreation } from '../../../composables/useQuizCreation';
 
   export default {
@@ -261,6 +264,32 @@
     },
     mixins: [commonCoreStrings],
     setup(_, context) {
+      const router = getCurrentInstance().proxy.$router;
+
+      const {
+        sectionSettings$,
+        sectionTitle$,
+        numberOfQuestionsLabel$,
+        optionalDescriptionLabel$,
+        quizResourceSelection$,
+        numberOfSelectedResources$,
+        currentSection$,
+        deleteSectionLabel$,
+        applySettings$,
+        changeResources$,
+        sectionOrder$,
+        questionOrder$,
+        randomizedLabel$,
+        randomizedOptionDescription$,
+        fixedLabel$,
+        fixedOptionDescription$,
+        closeConfirmationMessage$,
+        closeConfirmationTitle$,
+        deleteConfirmation$,
+        changesSavedSuccessfully$,
+        sectionDeletedNotification$,
+      } = enhancedQuizManagementStrings;
+
       const {
         activeSection,
         allSections,
@@ -286,8 +315,12 @@
       }
 
       function handleConfirmDelete() {
+        const section_title = activeSection.value.section_title;
         removeSection(showDeleteConfirmation.value);
-        context.emit('closePanel');
+        router.replace({
+          name: PageNames.EXAM_CREATION_ROOT,
+          query: { snackbar: sectionDeletedNotification$({ section_title }) },
+        });
       }
 
       function handleDeleteSection(section_id) {
@@ -319,29 +352,6 @@
 
       const { windowIsLarge, windowIsSmall } = useKResponsiveWindow();
 
-      const {
-        sectionSettings$,
-        sectionTitle$,
-        numberOfQuestionsLabel$,
-        optionalDescriptionLabel$,
-        quizResourceSelection$,
-        numberOfSelectedResources$,
-        currentSection$,
-        deleteSectionLabel$,
-        applySettings$,
-        changeResources$,
-        sectionOrder$,
-        questionOrder$,
-        randomizedLabel$,
-        randomizedOptionDescription$,
-        fixedLabel$,
-        fixedOptionDescription$,
-        closeConfirmationMessage$,
-        closeConfirmationTitle$,
-        deleteConfirmation$,
-        changesSavedSuccessfully$,
-      } = enhancedQuizManagementStrings;
-
       return {
         formDataHasChanged,
         showCloseConfirmation,
@@ -371,6 +381,7 @@
         optionalDescriptionLabel$,
         quizResourceSelection$,
         numberOfSelectedResources$,
+        sectionDeletedNotification$,
         currentSection$,
         deleteSectionLabel$,
         applySettings$,
diff --git a/packages/kolibri-common/strings/enhancedQuizManagementStrings.js b/packages/kolibri-common/strings/enhancedQuizManagementStrings.js
index 8ef8138df40..f19125ec372 100644
--- a/packages/kolibri-common/strings/enhancedQuizManagementStrings.js
+++ b/packages/kolibri-common/strings/enhancedQuizManagementStrings.js
@@ -178,4 +178,8 @@ export const enhancedQuizManagementStrings = createTranslator('EnhancedQuizManag
     message: 'Changes saved successfully',
     context: 'A snackbar message that appears when the user saves their changes',
   },
+  sectionDeletedNotification: {
+    message: "Section '{ section_title }' deleted",
+    context: 'A snackbar message that appears when the user deletes a section',
+  },
 });

From 82e3fd240661b15d185a15d557b8232f5e2f3bc3 Mon Sep 17 00:00:00 2001
From: Jacob Pierce <w.jacobpierce@gmail.com>
Date: Sun, 3 Mar 2024 23:47:04 -0800
Subject: [PATCH 23/67] correct messaging for close confirmation select
 resources

---
 .../views/plan/CreateExamPage/ResourceSelection.vue  | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/kolibri/plugins/coach/assets/src/views/plan/CreateExamPage/ResourceSelection.vue b/kolibri/plugins/coach/assets/src/views/plan/CreateExamPage/ResourceSelection.vue
index b4183bdb2ea..e8417a07f9f 100644
--- a/kolibri/plugins/coach/assets/src/views/plan/CreateExamPage/ResourceSelection.vue
+++ b/kolibri/plugins/coach/assets/src/views/plan/CreateExamPage/ResourceSelection.vue
@@ -97,13 +97,13 @@
     </div>
     <KModal
       v-if="showCloseConfirmation"
-      submitText="YES CLOSE IT"
-      cancelText="CANCEL"
-      title="CLOSE PANEL"
+      :submitText="coreString('continueAction')"
+      :cancelText="coreString('cancelAction')"
+      :title="closeConfirmationTitle$()"
       @cancel="handleCancelClose"
       @submit="handleConfirmClose"
     >
-      yes?
+      {{ closeConfirmationMessage$() }}
     </KModal>
   </div>
 
@@ -161,6 +161,8 @@
         changesSavedSuccessfully$,
         selectedResourcesInformation$,
         cannotSelectSomeTopicWarning$,
+        closeConfirmationMessage$,
+        closeConfirmationTitle$,
       } = enhancedQuizManagementStrings;
 
       // TODO let's not use text for this
@@ -473,6 +475,8 @@
         contentPresentInWorkingResourcePool,
         //contentList,
         cannotSelectSomeTopicWarning$,
+        closeConfirmationMessage$,
+        closeConfirmationTitle$,
         changesSavedSuccessfully$,
         sectionSettings$,
         selectFromBookmarks$,

From d0f9ad4da6bd33869b2b7fe0c95b098618318019 Mon Sep 17 00:00:00 2001
From: Jacob Pierce <w.jacobpierce@gmail.com>
Date: Sun, 3 Mar 2024 23:47:31 -0800
Subject: [PATCH 24/67] handle clicking outside of modal as closing side panel

---
 .../src/views/plan/CreateExamPage/SectionSidePanel.vue   | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/kolibri/plugins/coach/assets/src/views/plan/CreateExamPage/SectionSidePanel.vue b/kolibri/plugins/coach/assets/src/views/plan/CreateExamPage/SectionSidePanel.vue
index bfca8bd5fee..aa92f6026a7 100644
--- a/kolibri/plugins/coach/assets/src/views/plan/CreateExamPage/SectionSidePanel.vue
+++ b/kolibri/plugins/coach/assets/src/views/plan/CreateExamPage/SectionSidePanel.vue
@@ -17,6 +17,7 @@
 
 <script>
 
+  import { onClickOutside } from '@vueuse/core';
   import SidePanelModal from 'kolibri-common/components/SidePanelModal';
   import { ref, watch, computed, getCurrentInstance } from 'kolibri.lib.vueCompositionApi';
   import logging from 'kolibri.lib.logging';
@@ -30,7 +31,7 @@
     components: {
       SidePanelModal,
     },
-    setup() {
+    setup(_, context) {
       const { activeSection } = injectQuizCreation();
       const store = getCurrentInstance().proxy.$store;
       const router = getCurrentInstance().proxy.$router;
@@ -51,6 +52,7 @@
           to.params.topic_id === routeWhenSidePanelOpened.params.topic_id &&
           to.query.showBookmarks === routeWhenSidePanelOpened.query.showBookmarks &&
           to.query.search === routeWhenSidePanelOpened.query.search;
+
         prevRoute.value = from;
       });
 
@@ -67,6 +69,11 @@
         }
       }
 
+      onClickOutside(context.refs.resourcePanel, () => {
+        canCloseSidePanel.value = true;
+        handleClosePanel();
+      });
+
       const closeBackIcon = computed(() => {
         if (canCloseSidePanel.value) {
           return 'close';

From 642b250f2df25de4240f9c89b3b2fced987e54a1 Mon Sep 17 00:00:00 2001
From: Jacob Pierce <w.jacobpierce@gmail.com>
Date: Sun, 3 Mar 2024 23:52:39 -0800
Subject: [PATCH 25/67] fix sidepanelmodal breakpoint for when it would go into
 mobile-mode

---
 packages/kolibri-common/components/SidePanelModal/index.vue | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/packages/kolibri-common/components/SidePanelModal/index.vue b/packages/kolibri-common/components/SidePanelModal/index.vue
index 85a6f698d52..99e433f203b 100644
--- a/packages/kolibri-common/components/SidePanelModal/index.vue
+++ b/packages/kolibri-common/components/SidePanelModal/index.vue
@@ -117,10 +117,8 @@
     },
     computed: {
       isMobile() {
-        if (!get(this.windowBreakpoint)) {
-          return false;
-        }
-        return get(this.windowBreakpoint) == 0;
+        // This should be suitable for any mobile/tablet
+        return get(this.windowBreakpoint) <= 2;
       },
       /* Returns an object with properties left or right set to the appropriate value
            depending on isRtl and this.alignment */

From e84f7abaecdf5cdd2e15cf3867ab7414ba6e768e Mon Sep 17 00:00:00 2001
From: Jacob Pierce <w.jacobpierce@gmail.com>
Date: Mon, 4 Mar 2024 16:05:39 -0800
Subject: [PATCH 26/67] fix number of resources on section editor

---
 .../plan/CreateExamPage/SectionEditor.vue     | 27 ++++++++++++++-----
 1 file changed, 20 insertions(+), 7 deletions(-)

diff --git a/kolibri/plugins/coach/assets/src/views/plan/CreateExamPage/SectionEditor.vue b/kolibri/plugins/coach/assets/src/views/plan/CreateExamPage/SectionEditor.vue
index 70cb6dbe39f..11665c9c24c 100644
--- a/kolibri/plugins/coach/assets/src/views/plan/CreateExamPage/SectionEditor.vue
+++ b/kolibri/plugins/coach/assets/src/views/plan/CreateExamPage/SectionEditor.vue
@@ -112,7 +112,16 @@
     >
       {{ quizResourceSelection$() }}
     </h5>
-    <p>{{ numberOfSelectedResources$({ count: 4 }) }}</p>
+    <p>
+      {{
+        numberOfSelectedResources$(
+          {
+            count: activeResourcePool.length,
+            channels: channels.length
+          }
+        )
+      }}
+    </p>
 
     <KRouterLink
       appearance="raised-button"
@@ -191,9 +200,9 @@
     <div class="bottom-buttons-style">
       <KGrid>
         <KGridItem
-          :layout12="{ span: 4 }"
-          :layout8="{ span: 2 }"
-          :layout4="{ span: 1 }"
+          :layout12="{ span: 6 }"
+          :layout8="{ span: 4 }"
+          :layout4="{ span: 2 }"
         >
           <KButton
             :text="deleteSectionLabel$()"
@@ -203,9 +212,9 @@
         </KGridItem>
         <KGridItem
           style="text-align: right;"
-          :layout12="{ span: 8 }"
-          :layout8="{ span: 6 }"
-          :layout4="{ span: 3 }"
+          :layout12="{ span: 6 }"
+          :layout8="{ span: 4 }"
+          :layout4="{ span: 2 }"
         >
           <KButton
             :primary="true"
@@ -292,10 +301,12 @@
 
       const {
         activeSection,
+        activeResourcePool,
         allSections,
         updateSection,
         updateQuiz,
         removeSection,
+        channels,
       } = injectQuizCreation();
 
       const showCloseConfirmation = ref(false);
@@ -361,7 +372,9 @@
         handleCancelDelete,
         handleConfirmDelete,
         // useQuizCreation
+        channels,
         activeSection,
+        activeResourcePool,
         allSections,
         updateSection,
         updateQuiz,

From c73ed36cde6979a434ee9ff23b22109ad3d6ffcd Mon Sep 17 00:00:00 2001
From: Jacob Pierce <w.jacobpierce@gmail.com>
Date: Mon, 4 Mar 2024 16:05:56 -0800
Subject: [PATCH 27/67] fix browser nav issues w/ showBookmarks

---
 .../views/plan/CreateExamPage/ResourceSelection.vue    | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/kolibri/plugins/coach/assets/src/views/plan/CreateExamPage/ResourceSelection.vue b/kolibri/plugins/coach/assets/src/views/plan/CreateExamPage/ResourceSelection.vue
index e8417a07f9f..665386291f3 100644
--- a/kolibri/plugins/coach/assets/src/views/plan/CreateExamPage/ResourceSelection.vue
+++ b/kolibri/plugins/coach/assets/src/views/plan/CreateExamPage/ResourceSelection.vue
@@ -553,9 +553,13 @@
         this.$refs.textbox.focus();
       },
       contentLink(content) {
+        /* The click handler for the content card, no-op for non-folder cards */
         if (this.showBookmarks) {
-          return this.$route;
+          // If we're showing bookmarks, we don't want to link to anything
+          const { name, params, query } = this.$route;
+          return { name, params, query };
         } else if (!content.is_leaf) {
+          // Link folders to their page
           return {
             name: PageNames.QUIZ_SELECT_RESOURCES,
             params: {
@@ -565,8 +569,7 @@
             },
           };
         }
-
-        return {}; // or return {} if you prefer an empty object
+        return {}; // Or this could be how we handle leaf nodes if we wanted them to link somewhere
       },
       topicsLink(topic_id) {
         return this.$router.getRoute(PageNames.QUIZ_SELECT_RESOURCES, { topic_id });
@@ -577,7 +580,6 @@
           resource_pool: this.workingResourcePool,
         });
 
-        //Also reset workingResourcePool
         this.resetWorkingResourcePool();
 
         this.$router.replace({

From 39885abacf1cc8811a70617c50fc2859232b6239 Mon Sep 17 00:00:00 2001
From: Jacob Pierce <w.jacobpierce@gmail.com>
Date: Mon, 4 Mar 2024 16:06:35 -0800
Subject: [PATCH 28/67] styles updates & message update

---
 .../plan/CreateExamPage/CreateQuizSection.vue     | 15 ++++++++++-----
 .../strings/enhancedQuizManagementStrings.js      |  2 +-
 2 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/kolibri/plugins/coach/assets/src/views/plan/CreateExamPage/CreateQuizSection.vue b/kolibri/plugins/coach/assets/src/views/plan/CreateExamPage/CreateQuizSection.vue
index 4e07a9d3cfc..90655677036 100644
--- a/kolibri/plugins/coach/assets/src/views/plan/CreateExamPage/CreateQuizSection.vue
+++ b/kolibri/plugins/coach/assets/src/views/plan/CreateExamPage/CreateQuizSection.vue
@@ -1,6 +1,6 @@
 <template>
 
-  <div style="padding-top: 2rem;">
+  <div style="padding-top: 2rem; scroll: none;">
     <KGrid>
       <KGridItem
         :layout4="{ span: 1 }"
@@ -160,6 +160,8 @@
           <KGridItem
             class="left-side-heading"
             :layout12="{ span: 6 }"
+            :layout8="{ span: 4 }"
+            :layout4="{ span: 2 }"
           >
             <h2 :style="{ color: $themeTokens.annotation }">
               {{ questionList$() }}
@@ -168,6 +170,8 @@
           <KGridItem
             class="right-side-heading"
             :layout12="{ span: 6 }"
+            :layout8="{ span: 4 }"
+            :layout4="{ span: 2 }"
           >
             <KButton
               primary
@@ -321,7 +325,7 @@
 
 <script>
 
-  import { get, set } from '@vueuse/core';
+  import { get } from '@vueuse/core';
   import { ref } from 'kolibri.lib.vueCompositionApi';
   import logging from 'kolibri.lib.logging';
   import commonCoreStrings from 'kolibri.coreVue.mixins.commonCoreStrings';
@@ -459,7 +463,7 @@
           color: this.$themeTokens.text + '!important',
           textDecoration: 'none',
           // Ensure text doesn't get highlighted as we drag
-          userSelect: get(this.dragActive) ? 'none!important' : 'text',
+          userSelect: this.dragActive ? 'none!important' : 'text',
         };
       },
       addQuizSectionsStyles() {
@@ -574,12 +578,12 @@
         };
       },
       handleQuestionOrderChange({ newArray }) {
-        set(this.dragActive, false);
         const payload = {
           section_id: get(this.activeSection).section_id,
           questions: newArray,
         };
         this.updateSection(payload);
+        this.dragActive = false;
       },
       handleAddSection() {
         const newSection = this.addSection();
@@ -587,7 +591,8 @@
         this.sectionCreationCount++;
       },
       handleDragStart() {
-        set(this.dragActive, true);
+        // Used to mitigate the issue of text being selected while dragging
+        this.dragActive = true;
       },
       openSelectResources(section_id) {
         const route = this.$router.getRoute(PageNames.QUIZ_SELECT_RESOURCES, { section_id });
diff --git a/packages/kolibri-common/strings/enhancedQuizManagementStrings.js b/packages/kolibri-common/strings/enhancedQuizManagementStrings.js
index f19125ec372..a38b02058f1 100644
--- a/packages/kolibri-common/strings/enhancedQuizManagementStrings.js
+++ b/packages/kolibri-common/strings/enhancedQuizManagementStrings.js
@@ -153,7 +153,7 @@ export const enhancedQuizManagementStrings = createTranslator('EnhancedQuizManag
 
   numberOfSelectedResources: {
     message:
-      '{ count, number } { count, plural, one { resource selected } other { resources selected }} from { count, number } { count, plural, one { channel } other { channels }}',
+      '{ count, number } { count, plural, one { resource selected } other { resources selected }} from { channels, number } { channels, plural, one { channel } other { channels }}',
   },
   numberOfSelectedReplacements: {
     message:

From 69e855f1bccaa47b1eb875ff4b3edcbf37972bef Mon Sep 17 00:00:00 2001
From: Jacob Pierce <w.jacobpierce@gmail.com>
Date: Tue, 5 Mar 2024 14:44:22 -0800
Subject: [PATCH 29/67] spacing fix

---
 .../src/views/plan/CreateExamPage/SectionEditor.vue   | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/kolibri/plugins/coach/assets/src/views/plan/CreateExamPage/SectionEditor.vue b/kolibri/plugins/coach/assets/src/views/plan/CreateExamPage/SectionEditor.vue
index 11665c9c24c..b30dfd0ffc5 100644
--- a/kolibri/plugins/coach/assets/src/views/plan/CreateExamPage/SectionEditor.vue
+++ b/kolibri/plugins/coach/assets/src/views/plan/CreateExamPage/SectionEditor.vue
@@ -126,7 +126,7 @@
     <KRouterLink
       appearance="raised-button"
       :to="{ path: 'select-resources' }"
-      class="change-resource-button-style"
+      style="margin-bottom: 1em;"
       iconAfter="forward"
     >
       {{ changeResources$() }}
@@ -161,6 +161,7 @@
                 <KGridItem
                   :layout12="{ span: 1 }"
                   :layout8="{ span: 1 }"
+                  :layout4="{ span: 1 }"
                 >
                   <KIcon
                     icon="dragVertical"
@@ -170,16 +171,20 @@
 
                 <KGridItem
                   :layout12="{ span: 6 }"
-                  :layout8="{ span: 5 }"
+                  :layout8="{ span: 4 }"
+                  :layout4="{ span: 2 }"
                 >
                   <p class="space-content">
                     {{ section.section_title.toUpperCase() }}
                   </p>
                 </KGridItem>
 
+                <!-- Perhaps this should be positioned absolutely to
+                     accommodate longer section titles -->
                 <KGridItem
                   :layout12="{ span: 5 }"
-                  :layout8="{ span: 2 }"
+                  :layout8="{ span: 3 }"
+                  :layout4="{ span: 1 }"
                   class="current-section-style"
                   :style="{ color: $themePalette.grey.v_700 }"
                 >

From 3fed2b3161cfcd81f1b2d2620bd55cc062e5ede4 Mon Sep 17 00:00:00 2001
From: Jacob Pierce <w.jacobpierce@gmail.com>
Date: Tue, 5 Mar 2024 14:44:34 -0800
Subject: [PATCH 30/67] proper message on side panel back/close button

---
 .../kolibri-common/components/SidePanelModal/index.vue   | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/packages/kolibri-common/components/SidePanelModal/index.vue b/packages/kolibri-common/components/SidePanelModal/index.vue
index 99e433f203b..3706e7aeba9 100644
--- a/packages/kolibri-common/components/SidePanelModal/index.vue
+++ b/packages/kolibri-common/components/SidePanelModal/index.vue
@@ -36,8 +36,8 @@
             :icon="closeButtonIconType"
             class="close-button"
             :style="closeButtonStyle"
-            :ariaLabel="coreString('closeAction')"
-            :tooltip="coreString('closeAction')"
+            :ariaLabel="closeButtonMessage"
+            :tooltip="closeButtonMessage"
             @click="closePanel"
           />
 
@@ -166,6 +166,11 @@
           'z-index': 12,
         };
       },
+      closeButtonMessage() {
+        return this.closeButtonIconType === 'back'
+          ? this.coreString('backAction')
+          : this.coreString('closeAction');
+      },
       /* Change of position with change of close button type, default is close */
       closeButtonStyle() {
         if (this.isRtl) {

From bd5e2de40b37b3684dcb6b2edadd19b063c4d0b5 Mon Sep 17 00:00:00 2001
From: Jacob Pierce <w.jacobpierce@gmail.com>
Date: Tue, 5 Mar 2024 15:14:42 -0800
Subject: [PATCH 31/67] outline-offset on section tabs fix

---
 .../src/views/plan/CreateExamPage/CreateQuizSection.vue       | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/kolibri/plugins/coach/assets/src/views/plan/CreateExamPage/CreateQuizSection.vue b/kolibri/plugins/coach/assets/src/views/plan/CreateExamPage/CreateQuizSection.vue
index 90655677036..de5c6055a01 100644
--- a/kolibri/plugins/coach/assets/src/views/plan/CreateExamPage/CreateQuizSection.vue
+++ b/kolibri/plugins/coach/assets/src/views/plan/CreateExamPage/CreateQuizSection.vue
@@ -820,4 +820,8 @@
     align-self: flex-end;
   }
 
+  /deep/ .tab {
+    outline-offset: -5px !important;
+  }
+
 </style>

From bde269c93b9e2c2f3d715fbaa1d9918e78c206bd Mon Sep 17 00:00:00 2001
From: Jacob Pierce <w.jacobpierce@gmail.com>
Date: Thu, 7 Mar 2024 13:19:48 -0800
Subject: [PATCH 32/67] move exported method inline

---
 .../src/views/plan/CreateExamPage/ReplaceQuestions.vue     | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/kolibri/plugins/coach/assets/src/views/plan/CreateExamPage/ReplaceQuestions.vue b/kolibri/plugins/coach/assets/src/views/plan/CreateExamPage/ReplaceQuestions.vue
index 09da3e05272..973b0737cfb 100644
--- a/kolibri/plugins/coach/assets/src/views/plan/CreateExamPage/ReplaceQuestions.vue
+++ b/kolibri/plugins/coach/assets/src/views/plan/CreateExamPage/ReplaceQuestions.vue
@@ -130,7 +130,7 @@
       :submitText="coreString('continueAction')"
       :cancelText="coreString('cancelAction')"
       :title="closeConfirmationTitle$()"
-      @cancel="handleCancelClose"
+      @cancel="showCloseConfirmation = false"
       @submit="handleConfirmClose"
     >
       {{ closeConfirmationMessage$() }}
@@ -189,10 +189,6 @@
 
       const showCloseConfirmation = ref(false);
 
-      function handleCancelClose() {
-        showCloseConfirmation.value = false;
-      }
-
       function handleConfirmClose() {
         context.emit('closePanel');
       }
@@ -247,7 +243,6 @@
         activeResourceMap,
         showCloseConfirmation,
 
-        handleCancelClose,
         handleConfirmClose,
         clearSelectedQuestions,
         toggleItemState,

From a23598e1b3bf4788277244342fdc27685ddf2b79 Mon Sep 17 00:00:00 2001
From: Jacob Pierce <w.jacobpierce@gmail.com>
Date: Thu, 7 Mar 2024 13:26:14 -0800
Subject: [PATCH 33/67] make leaf content nodes not clickable or focusable

---
 .../plan/LessonResourceSelectionPage/ContentCardList.vue   | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/kolibri/plugins/coach/assets/src/views/plan/LessonResourceSelectionPage/ContentCardList.vue b/kolibri/plugins/coach/assets/src/views/plan/LessonResourceSelectionPage/ContentCardList.vue
index f2a4ce7ae93..186c3516100 100644
--- a/kolibri/plugins/coach/assets/src/views/plan/LessonResourceSelectionPage/ContentCardList.vue
+++ b/kolibri/plugins/coach/assets/src/views/plan/LessonResourceSelectionPage/ContentCardList.vue
@@ -23,7 +23,14 @@
           :indeterminate="contentIsIndeterminate(content)"
           @change="handleCheckboxChange(content, $event)"
         />
+        <!--
+          disabled, tabindex, style cursor set here to hack making the card not clickable
+          if you're trying to make the card clickable remove these properties
+        -->
         <LessonContentCard
+          :disabled="content.is_leaf"
+          :tabindex="content.is_leaf ? -1 : 0"
+          :style="{ cursor: content.is_leaf ? 'default' : 'pointer' }"
           :class="{ 'with-checkbox': needCheckboxes }"
           :title="content.title"
           :thumbnail="content.thumbnail"

From 261915313d3c4002ec739b19cabc6c34345c1645 Mon Sep 17 00:00:00 2001
From: Jacob Pierce <w.jacobpierce@gmail.com>
Date: Thu, 7 Mar 2024 15:05:24 -0800
Subject: [PATCH 34/67] move cursor CSS change to /deep/ selector

---
 .../plan/CreateExamPage/ResourceSelection.vue     |  6 ++++++
 .../ContentCardList.vue                           | 15 +++++++++++----
 2 files changed, 17 insertions(+), 4 deletions(-)

diff --git a/kolibri/plugins/coach/assets/src/views/plan/CreateExamPage/ResourceSelection.vue b/kolibri/plugins/coach/assets/src/views/plan/CreateExamPage/ResourceSelection.vue
index 665386291f3..3df5edc7476 100644
--- a/kolibri/plugins/coach/assets/src/views/plan/CreateExamPage/ResourceSelection.vue
+++ b/kolibri/plugins/coach/assets/src/views/plan/CreateExamPage/ResourceSelection.vue
@@ -711,4 +711,10 @@
       0 2px 1px -1px rgba(0, 0, 0, 0.12);
   }
 
+  // Force the leaf nodes not to look like a link
+  /deep/ .is-leaf.content-card {
+    cursor: default;
+    box-shadow: 0 1px 5px 0 #a1a1a1, 0 2px 2px 0 #e6e6e6, 0 3px 1px -2px #ffffff;
+  }
+
 </style>
diff --git a/kolibri/plugins/coach/assets/src/views/plan/LessonResourceSelectionPage/ContentCardList.vue b/kolibri/plugins/coach/assets/src/views/plan/LessonResourceSelectionPage/ContentCardList.vue
index 186c3516100..6510ac8214e 100644
--- a/kolibri/plugins/coach/assets/src/views/plan/LessonResourceSelectionPage/ContentCardList.vue
+++ b/kolibri/plugins/coach/assets/src/views/plan/LessonResourceSelectionPage/ContentCardList.vue
@@ -24,14 +24,14 @@
           @change="handleCheckboxChange(content, $event)"
         />
         <!--
-          disabled, tabindex, style cursor set here to hack making the card not clickable
+          disabled, tabindex, is-leaf class set here to hack making the card not clickable
           if you're trying to make the card clickable remove these properties
         -->
         <LessonContentCard
+          class="content-card"
           :disabled="content.is_leaf"
           :tabindex="content.is_leaf ? -1 : 0"
-          :style="{ cursor: content.is_leaf ? 'default' : 'pointer' }"
-          :class="{ 'with-checkbox': needCheckboxes }"
+          :class="{ 'with-checkbox': needCheckboxes, 'is-leaf': content.is_leaf }"
           :title="content.title"
           :thumbnail="content.thumbnail"
           :description="content.description"
@@ -75,6 +75,7 @@
 
 <script>
 
+  import { computed, toRefs } from 'kolibri.lib.vueCompositionApi';
   import commonCoreStrings from 'kolibri.coreVue.mixins.commonCoreStrings';
   import { ViewMoreButtonStates } from '../../../constants/index';
 
@@ -87,8 +88,14 @@
     },
     mixins: [commonCoreStrings],
 
-    setup() {
+    setup(props) {
+      const { selectAllChecked, selectAllIndeterminate } = toRefs(props);
+      // Code too long to display in template
+      const ariaChecked = computed(() => {
+        return selectAllChecked.value ? true : selectAllIndeterminate.value ? 'mixed' : false;
+      });
       return {
+        ariaChecked,
         ViewMoreButtonStates,
       };
     },

From c345839bf3eac6136f0eea082f296db135be789f Mon Sep 17 00:00:00 2001
From: Jacob Pierce <w.jacobpierce@gmail.com>
Date: Thu, 7 Mar 2024 15:14:08 -0800
Subject: [PATCH 35/67] include `aria-selected` indicator on accordion-item and
 content card when item is selected

---
 .../plan/CreateExamPage/CreateQuizSection.vue |   8 +-
 .../plan/CreateExamPage/ReplaceQuestions.vue  |   3 +
 .../ContentCardList.vue                       |   1 +
 test.html                                     | 107 ++++++++++++++++++
 4 files changed, 118 insertions(+), 1 deletion(-)
 create mode 100644 test.html

diff --git a/kolibri/plugins/coach/assets/src/views/plan/CreateExamPage/CreateQuizSection.vue b/kolibri/plugins/coach/assets/src/views/plan/CreateExamPage/CreateQuizSection.vue
index de5c6055a01..7efc263aea9 100644
--- a/kolibri/plugins/coach/assets/src/views/plan/CreateExamPage/CreateQuizSection.vue
+++ b/kolibri/plugins/coach/assets/src/views/plan/CreateExamPage/CreateQuizSection.vue
@@ -239,7 +239,13 @@
                   tabindex="-1"
                   style="background: white"
                 >
-                  <AccordionItem :id="question.question_id" :title="question.title">
+                  <AccordionItem
+                    :id="question.question_id"
+                    :title="question.title"
+                    :aria-selected="selectedActiveQuestions.includes(
+                      question.question_id
+                    )"
+                  >
                     <template #heading="{ title }">
                       <h3
                         class="accordion-header"
diff --git a/kolibri/plugins/coach/assets/src/views/plan/CreateExamPage/ReplaceQuestions.vue b/kolibri/plugins/coach/assets/src/views/plan/CreateExamPage/ReplaceQuestions.vue
index 973b0737cfb..6b0b312962a 100644
--- a/kolibri/plugins/coach/assets/src/views/plan/CreateExamPage/ReplaceQuestions.vue
+++ b/kolibri/plugins/coach/assets/src/views/plan/CreateExamPage/ReplaceQuestions.vue
@@ -39,6 +39,9 @@
           :id="question.question_id"
           :key="index"
           :title="question.title"
+          :aria-selected="
+            replacements.length && replacements.length === selectedActiveQuestions.length
+          "
         >
           <template #heading="{ title }">
             <h3
diff --git a/kolibri/plugins/coach/assets/src/views/plan/LessonResourceSelectionPage/ContentCardList.vue b/kolibri/plugins/coach/assets/src/views/plan/LessonResourceSelectionPage/ContentCardList.vue
index 6510ac8214e..add1a52b31d 100644
--- a/kolibri/plugins/coach/assets/src/views/plan/LessonResourceSelectionPage/ContentCardList.vue
+++ b/kolibri/plugins/coach/assets/src/views/plan/LessonResourceSelectionPage/ContentCardList.vue
@@ -13,6 +13,7 @@
         v-for="content in contentList"
         :key="content.id"
         class="content-list-item"
+        :aria-selected="contentIsChecked(content)"
       >
         <KCheckbox
           v-if="contentHasCheckbox(content)"
diff --git a/test.html b/test.html
new file mode 100644
index 00000000000..3376ec8020c
--- /dev/null
+++ b/test.html
@@ -0,0 +1,107 @@
+<div
+  data-v-14fcf54d=""
+  data-v-7234c0cd=""
+  role="tablist"
+  aria-label="Coach plan"
+  data-v-b35697ba=""
+  style="position: relative;
+  top: 5px;">
+  <a
+    data-v-14fcf54d=""
+    id="coachPlan-tabLessons"
+    role="tab"
+    data-tabid="tabLessons"
+    href="#/65b72c4f2c7993b1320b0bc0f6622f16/plan/lessons"
+    tabindex="-1"
+    aria-selected="false"
+    aria-controls="coachPlan-tabLessons-panel"
+    class="tab KTabsList-noKey-0_qlz05j"
+  >
+    Lessons
+  </a>
+  <a
+    data-v-14fcf54d=""
+    id="coachPlan-tabQuizzes"
+    role="tab"
+    data-activeroute="true"
+    data-tabid="tabQuizzes"
+    href="#/65b72c4f2c7993b1320b0bc0f6622f16/plan/quizzes"
+    tabindex="0"
+    aria-selected="true"
+    aria-controls="coachPlan-tabQuizzes-panel"
+    class="tab active KTabsList-noKey-0_1hw4dkw"
+  >
+    Quizzes
+  </a>
+  <a
+    data-v-14fcf54d=""
+    id="coachPlan-tabGroups"
+    role="tab"
+    data-tabid="tabGroups"
+    href="#/65b72c4f2c7993b1320b0bc0f6622f16/plan/groups"
+    tabindex="-1"
+    aria-selected="false"
+    aria-controls="coachPlan-tabGroups-panel"
+    class="tab KTabsList-noKey-0_qlz05j"
+  >
+    Groups
+  </a>
+</div>
+
+
+<div
+  data-v-14fcf54d=""
+  data-v-24732104=""
+  role="tablist"
+  aria-label="Quiz sections"
+  class="tabs-wrapper"
+>
+  <button
+    data-v-14fcf54d=""
+    id="quizSectionTabs-829b851c71df408d90a13f9d155c1811"
+    type="button"
+    role="tab"
+    tabindex="-1"
+    aria-selected="false"
+    aria-controls="quizSectionTabs-829b851c71df408d90a13f9d155c1811-panel"
+    class="tab KTabsList-noKey-0_qcqj1z"
+  >
+    <span
+      data-v-0b5a9da6=""
+      data-v-14fcf54d=""
+      appearance="flat-button"
+      appearanceoverrides="[object Object]"
+      style="display: inline-block;"
+    >
+      Section 1
+    </span>
+  </button>
+  <button
+    data-v-14fcf54d=""
+    id="quizSectionTabs-62216fac56974bc3a1752aa39f135bbb"
+    type="button"
+    role="tab"
+    tabindex="-1"
+    aria-selected="false"
+    aria-controls="quizSectionTabs-62216fac56974bc3a1752aa39f135bbb-panel"
+    class="tab KTabsList-noKey-0_qcqj1z"
+  >
+    <span data-v-0b5a9da6="" data-v-14fcf54d="" appearance="flat-button" appearanceoverrides="[object Object]" style="display: inline-block;">
+    Section 2
+    </span>
+  </button>
+  <button
+    data-v-14fcf54d=""
+    id="quizSectionTabs-bd8cfa85c57a41bd8fbb3424196456f1"
+    type="button"
+    role="tab"
+    tabindex="0"
+    aria-selected="true"
+    aria-controls="quizSectionTabs-bd8cfa85c57a41bd8fbb3424196456f1-panel"
+    class="tab active KTabsList-noKey-0_y568vp"
+  >
+    <span data-v-0b5a9da6="" data-v-14fcf54d="" appearance="flat-button" appearanceoverrides="[object Object]" style="display: inline-block;">
+      Section 3
+    </span>
+  </button>
+</div>

From 4e0e7e6beb36fc57cde1d76c865d74367b98f01e Mon Sep 17 00:00:00 2001
From: Jacob Pierce <w.jacobpierce@gmail.com>
Date: Thu, 7 Mar 2024 15:16:12 -0800
Subject: [PATCH 36/67] comment on deep selector for section tabs

---
 .../assets/src/views/plan/CreateExamPage/CreateQuizSection.vue   | 1 +
 1 file changed, 1 insertion(+)

diff --git a/kolibri/plugins/coach/assets/src/views/plan/CreateExamPage/CreateQuizSection.vue b/kolibri/plugins/coach/assets/src/views/plan/CreateExamPage/CreateQuizSection.vue
index 7efc263aea9..f1b47e284cd 100644
--- a/kolibri/plugins/coach/assets/src/views/plan/CreateExamPage/CreateQuizSection.vue
+++ b/kolibri/plugins/coach/assets/src/views/plan/CreateExamPage/CreateQuizSection.vue
@@ -826,6 +826,7 @@
     align-self: flex-end;
   }
 
+  // This makes sure that the keyboard focus ring is visible on the section tabs
   /deep/ .tab {
     outline-offset: -5px !important;
   }

From 2c340a6a31e9e2c50b08002e509a811a527e2e91 Mon Sep 17 00:00:00 2001
From: Jacob Pierce <w.jacobpierce@gmail.com>
Date: Thu, 7 Mar 2024 15:20:35 -0800
Subject: [PATCH 37/67] comment clarifying ReplaceQuestions#beforeRouteLeave

---
 .../src/views/plan/CreateExamPage/ReplaceQuestions.vue       | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/kolibri/plugins/coach/assets/src/views/plan/CreateExamPage/ReplaceQuestions.vue b/kolibri/plugins/coach/assets/src/views/plan/CreateExamPage/ReplaceQuestions.vue
index 6b0b312962a..d2908139521 100644
--- a/kolibri/plugins/coach/assets/src/views/plan/CreateExamPage/ReplaceQuestions.vue
+++ b/kolibri/plugins/coach/assets/src/views/plan/CreateExamPage/ReplaceQuestions.vue
@@ -273,6 +273,11 @@
       },
     },
     beforeRouteLeave(_, __, next) {
+      /**
+        If we don't have replacement.length then there are no changes to prompt about.
+        But if there are we only show if the number of replacements is the same as the number
+        of selected questions to be replaced
+      */
       if (
         !this.showCloseConfirmation &&
         this.replacements.length &&

From cef5f454f3812504f6faf3200429dcb5eb41d4ae Mon Sep 17 00:00:00 2001
From: Jacob Pierce <w.jacobpierce@gmail.com>
Date: Fri, 8 Mar 2024 11:11:52 -0800
Subject: [PATCH 38/67] section tabs have tabindex set to 0; keyboad focus fix
 from options dropdown

---
 .../src/views/plan/CreateExamPage/CreateQuizSection.vue    | 5 +++--
 .../src/views/plan/CreateExamPage/TabsWithOverflow.vue     | 7 +++++++
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/kolibri/plugins/coach/assets/src/views/plan/CreateExamPage/CreateQuizSection.vue b/kolibri/plugins/coach/assets/src/views/plan/CreateExamPage/CreateQuizSection.vue
index f1b47e284cd..417061718f3 100644
--- a/kolibri/plugins/coach/assets/src/views/plan/CreateExamPage/CreateQuizSection.vue
+++ b/kolibri/plugins/coach/assets/src/views/plan/CreateExamPage/CreateQuizSection.vue
@@ -113,6 +113,7 @@
           style="padding: 0.7em 0.75em;"
         >
           <KButton
+            ref="addQuestionsButton"
             primary
             :text="coreString('optionsLabel')"
           >
@@ -122,7 +123,8 @@
                 :disabled="false"
                 :hasIcons="true"
                 :options="activeSectionActions"
-                @tab="e => (e.preventDefault() || $refs.selectAllCheckbox.focus())"
+                @tab="$refs.addQuestionsButton.$el.focus()"
+                @close="$refs.addQuestionsButton.$el.focus()"
                 @select="handleActiveSectionAction"
               />
             </template>
@@ -183,7 +185,6 @@
                   :disabled="false"
                   :hasIcons="true"
                   :options="activeSectionActions"
-                  @tab="e => (e.preventDefault() || $refs.selectAllCheckbox.focus())"
                   @select="handleActiveSectionAction"
                 />
               </template>
diff --git a/kolibri/plugins/coach/assets/src/views/plan/CreateExamPage/TabsWithOverflow.vue b/kolibri/plugins/coach/assets/src/views/plan/CreateExamPage/TabsWithOverflow.vue
index 68feecbaae8..1ce71d02020 100644
--- a/kolibri/plugins/coach/assets/src/views/plan/CreateExamPage/TabsWithOverflow.vue
+++ b/kolibri/plugins/coach/assets/src/views/plan/CreateExamPage/TabsWithOverflow.vue
@@ -63,6 +63,7 @@
       tabs() {
         this.$nextTick(() => {
           this.setOverflowTabs();
+          this.setTabindex();
         });
       },
     },
@@ -70,9 +71,15 @@
       this.mounted = true;
       this.$nextTick(() => {
         this.setOverflowTabs();
+        this.setTabindex();
       });
     },
     methods: {
+      setTabindex() {
+        Array.from(this.$refs.tabsWrapper.$el.children).forEach(tab => {
+          tab.setAttribute('tabindex', 0);
+        });
+      },
       setOverflowTabs() {
         this.overflowTabs =
           this.mounted && this.windowWidth

From 7e187d4fb324fc1fd7e539aa3a97b5e47bf09f8d Mon Sep 17 00:00:00 2001
From: Jacob Pierce <w.jacobpierce@gmail.com>
Date: Mon, 11 Mar 2024 12:41:02 -0700
Subject: [PATCH 39/67] move 'can we try to replace' logic to computed prop,
 disable Replace button

---
 .../plan/CreateExamPage/ReplaceQuestions.vue  | 19 +++++++++++--------
 1 file changed, 11 insertions(+), 8 deletions(-)

diff --git a/kolibri/plugins/coach/assets/src/views/plan/CreateExamPage/ReplaceQuestions.vue b/kolibri/plugins/coach/assets/src/views/plan/CreateExamPage/ReplaceQuestions.vue
index d2908139521..ace16b632a3 100644
--- a/kolibri/plugins/coach/assets/src/views/plan/CreateExamPage/ReplaceQuestions.vue
+++ b/kolibri/plugins/coach/assets/src/views/plan/CreateExamPage/ReplaceQuestions.vue
@@ -122,7 +122,7 @@
           <KButton
             :primary="true"
             :text="replaceAction$()"
-            :disable="replacements.length !== selectedActiveQuestions.length"
+            :disable="canProceedToReplace"
             @click="handleReplacement"
           />
         </KGridItem>
@@ -271,18 +271,21 @@
           userSelect: get(this.dragActive) ? 'none!important' : 'text',
         };
       },
-    },
-    beforeRouteLeave(_, __, next) {
       /**
         If we don't have replacement.length then there are no changes to prompt about.
         But if there are we only show if the number of replacements is the same as the number
         of selected questions to be replaced
       */
-      if (
-        !this.showCloseConfirmation &&
-        this.replacements.length &&
-        this.replacements.length !== this.selectedActiveQuestions.length
-      ) {
+      canProceedToReplace() {
+        return (
+          !this.showCloseConfirmation &&
+          this.replacements.length &&
+          this.replacements.length !== this.selectedActiveQuestions.length
+        );
+      },
+    },
+    beforeRouteLeave(_, __, next) {
+      if (this.canProceedToReplace) {
         this.showCloseConfirmation = true;
         next(false);
       } else {

From db06ddf61bdcdda34ff772009f5a5affe4397b8f Mon Sep 17 00:00:00 2001
From: Jacob Pierce <w.jacobpierce@gmail.com>
Date: Mon, 11 Mar 2024 13:55:52 -0700
Subject: [PATCH 40/67] fix & improve replacements KCheckbox handling

---
 .../plan/CreateExamPage/ReplaceQuestions.vue  | 33 ++++++++++++-------
 1 file changed, 22 insertions(+), 11 deletions(-)

diff --git a/kolibri/plugins/coach/assets/src/views/plan/CreateExamPage/ReplaceQuestions.vue b/kolibri/plugins/coach/assets/src/views/plan/CreateExamPage/ReplaceQuestions.vue
index ace16b632a3..ac4cc86937e 100644
--- a/kolibri/plugins/coach/assets/src/views/plan/CreateExamPage/ReplaceQuestions.vue
+++ b/kolibri/plugins/coach/assets/src/views/plan/CreateExamPage/ReplaceQuestions.vue
@@ -28,9 +28,9 @@
           ref="selectAllCheckbox"
           class="select-all-box"
           :label="selectAllLabel$()"
-          :checked="replacements.length && replacements.length === selectedActiveQuestions.length"
+          :checked="selectAllIsChecked"
           :indeterminate="selectAllIsIndeterminate"
-          @change="() => selectAllQuestions()"
+          @change="selectAllReplacementQuestions"
         />
       </template>
       <template #default="{ toggleItemState, isItemExpanded }">
@@ -49,9 +49,7 @@
             >
               <KCheckbox
                 class="accordion-checkbox"
-                :checked="replacements.map(q => q.id).includes(
-                  question.question_id
-                )"
+                :checked="replacements.map(r => r.question_id).includes(question.question_id)"
                 @change="() => toggleInReplacements(question)"
               />
               <KButton
@@ -122,7 +120,7 @@
           <KButton
             :primary="true"
             :text="replaceAction$()"
-            :disable="canProceedToReplace"
+            :disabled="!canProceedToReplace"
             @click="handleReplacement"
           />
         </KGridItem>
@@ -184,7 +182,6 @@
         clearSelectedQuestions,
         toggleItemState,
         isItemExpanded,
-        selectAllReplacementQuestions,
         replaceSelectedQuestions,
         toggleQuestionInSelection,
         updateSection,
@@ -229,10 +226,24 @@
       const selectAllIsIndeterminate = computed(() => {
         return (
           replacements.value.length > 0 &&
-          replacements.value.length !== selectedActiveQuestions.value.length
+          replacements.value.length !== replacementQuestionPool.value.length
+        );
+      });
+
+      const selectAllIsChecked = computed(() => {
+        return (
+          replacements.value && replacements.value.length === replacementQuestionPool.value.length
         );
       });
 
+      function selectAllReplacementQuestions() {
+        if (replacements.value.length === replacementQuestionPool.value.length) {
+          replacements.value = [];
+        } else {
+          replacements.value = replacementQuestionPool.value;
+        }
+      }
+
       return {
         toggleInReplacements,
         handleReplacement,
@@ -242,6 +253,7 @@
         selectedActiveQuestions,
         replacementQuestionPool,
         selectAllIsIndeterminate,
+        selectAllIsChecked,
         replaceSelectedQuestions,
         activeResourceMap,
         showCloseConfirmation,
@@ -278,14 +290,13 @@
       */
       canProceedToReplace() {
         return (
-          !this.showCloseConfirmation &&
           this.replacements.length &&
-          this.replacements.length !== this.selectedActiveQuestions.length
+          this.replacements.length === this.selectedActiveQuestions.length
         );
       },
     },
     beforeRouteLeave(_, __, next) {
-      if (this.canProceedToReplace) {
+      if (!this.showCloseConfirmation && this.canProceedToReplace) {
         this.showCloseConfirmation = true;
         next(false);
       } else {

From 1757bb7f1af15cd8397bd9e66a7ed46460be057e Mon Sep 17 00:00:00 2001
From: Jacob Pierce <w.jacobpierce@gmail.com>
Date: Mon, 11 Mar 2024 14:16:44 -0700
Subject: [PATCH 41/67] fix checkbox console errors; allQuestionsSelected now
 returns Boolean, not int

---
 .../assets/src/composables/useQuizCreation.js    | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/kolibri/plugins/coach/assets/src/composables/useQuizCreation.js b/kolibri/plugins/coach/assets/src/composables/useQuizCreation.js
index 5fbecfe7549..fcc6fb14309 100644
--- a/kolibri/plugins/coach/assets/src/composables/useQuizCreation.js
+++ b/kolibri/plugins/coach/assets/src/composables/useQuizCreation.js
@@ -447,19 +447,19 @@ export default function useQuizCreation(DEBUG = false) {
 
   /** @type {ComputedRef<Boolean>} Whether all active questions are selected */
   const allQuestionsSelected = computed(() => {
-    return (
+    return Boolean(
       get(selectedActiveQuestions).length &&
-      isEqual(
-        get(selectedActiveQuestions).sort(),
-        get(activeQuestions)
-          .map(q => q.question_id)
-          .sort()
-      )
+        isEqual(
+          get(selectedActiveQuestions).sort(),
+          get(activeQuestions)
+            .map(q => q.question_id)
+            .sort()
+        )
     );
   });
 
   /**
-   * Deletes and clears the selected questions from the active section
+
    */
   function deleteActiveSelectedQuestions() {
     const { section_id, questions } = get(activeSection);

From e9528e90ef7a06469719b11ebeb2725115a106b6 Mon Sep 17 00:00:00 2001
From: Jacob Pierce <w.jacobpierce@gmail.com>
Date: Fri, 15 Mar 2024 08:32:22 -0700
Subject: [PATCH 42/67] accidental merge removed

---
 test.html | 107 ------------------------------------------------------
 1 file changed, 107 deletions(-)
 delete mode 100644 test.html

diff --git a/test.html b/test.html
deleted file mode 100644
index 3376ec8020c..00000000000
--- a/test.html
+++ /dev/null
@@ -1,107 +0,0 @@
-<div
-  data-v-14fcf54d=""
-  data-v-7234c0cd=""
-  role="tablist"
-  aria-label="Coach plan"
-  data-v-b35697ba=""
-  style="position: relative;
-  top: 5px;">
-  <a
-    data-v-14fcf54d=""
-    id="coachPlan-tabLessons"
-    role="tab"
-    data-tabid="tabLessons"
-    href="#/65b72c4f2c7993b1320b0bc0f6622f16/plan/lessons"
-    tabindex="-1"
-    aria-selected="false"
-    aria-controls="coachPlan-tabLessons-panel"
-    class="tab KTabsList-noKey-0_qlz05j"
-  >
-    Lessons
-  </a>
-  <a
-    data-v-14fcf54d=""
-    id="coachPlan-tabQuizzes"
-    role="tab"
-    data-activeroute="true"
-    data-tabid="tabQuizzes"
-    href="#/65b72c4f2c7993b1320b0bc0f6622f16/plan/quizzes"
-    tabindex="0"
-    aria-selected="true"
-    aria-controls="coachPlan-tabQuizzes-panel"
-    class="tab active KTabsList-noKey-0_1hw4dkw"
-  >
-    Quizzes
-  </a>
-  <a
-    data-v-14fcf54d=""
-    id="coachPlan-tabGroups"
-    role="tab"
-    data-tabid="tabGroups"
-    href="#/65b72c4f2c7993b1320b0bc0f6622f16/plan/groups"
-    tabindex="-1"
-    aria-selected="false"
-    aria-controls="coachPlan-tabGroups-panel"
-    class="tab KTabsList-noKey-0_qlz05j"
-  >
-    Groups
-  </a>
-</div>
-
-
-<div
-  data-v-14fcf54d=""
-  data-v-24732104=""
-  role="tablist"
-  aria-label="Quiz sections"
-  class="tabs-wrapper"
->
-  <button
-    data-v-14fcf54d=""
-    id="quizSectionTabs-829b851c71df408d90a13f9d155c1811"
-    type="button"
-    role="tab"
-    tabindex="-1"
-    aria-selected="false"
-    aria-controls="quizSectionTabs-829b851c71df408d90a13f9d155c1811-panel"
-    class="tab KTabsList-noKey-0_qcqj1z"
-  >
-    <span
-      data-v-0b5a9da6=""
-      data-v-14fcf54d=""
-      appearance="flat-button"
-      appearanceoverrides="[object Object]"
-      style="display: inline-block;"
-    >
-      Section 1
-    </span>
-  </button>
-  <button
-    data-v-14fcf54d=""
-    id="quizSectionTabs-62216fac56974bc3a1752aa39f135bbb"
-    type="button"
-    role="tab"
-    tabindex="-1"
-    aria-selected="false"
-    aria-controls="quizSectionTabs-62216fac56974bc3a1752aa39f135bbb-panel"
-    class="tab KTabsList-noKey-0_qcqj1z"
-  >
-    <span data-v-0b5a9da6="" data-v-14fcf54d="" appearance="flat-button" appearanceoverrides="[object Object]" style="display: inline-block;">
-    Section 2
-    </span>
-  </button>
-  <button
-    data-v-14fcf54d=""
-    id="quizSectionTabs-bd8cfa85c57a41bd8fbb3424196456f1"
-    type="button"
-    role="tab"
-    tabindex="0"
-    aria-selected="true"
-    aria-controls="quizSectionTabs-bd8cfa85c57a41bd8fbb3424196456f1-panel"
-    class="tab active KTabsList-noKey-0_y568vp"
-  >
-    <span data-v-0b5a9da6="" data-v-14fcf54d="" appearance="flat-button" appearanceoverrides="[object Object]" style="display: inline-block;">
-      Section 3
-    </span>
-  </button>
-</div>

From 34902a24ce6170a23d6e1a8661d4319c90319dc6 Mon Sep 17 00:00:00 2001
From: Jacob Pierce <w.jacobpierce@gmail.com>
Date: Mon, 18 Mar 2024 13:19:01 -0700
Subject: [PATCH 43/67] move bookmarks exercise filter to where the value is
 set

this ensures we don't have to worry about filtering the list elsewhere
and fixes an issue where the # of bookmarks shown was ALL bookmarks,
not just exercises
---
 .../src/views/plan/CreateExamPage/ResourceSelection.vue    | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/kolibri/plugins/coach/assets/src/views/plan/CreateExamPage/ResourceSelection.vue b/kolibri/plugins/coach/assets/src/views/plan/CreateExamPage/ResourceSelection.vue
index 3df5edc7476..e4ec2046f80 100644
--- a/kolibri/plugins/coach/assets/src/views/plan/CreateExamPage/ResourceSelection.vue
+++ b/kolibri/plugins/coach/assets/src/views/plan/CreateExamPage/ResourceSelection.vue
@@ -343,7 +343,8 @@
         const channelBookmarkPromises = [
           ContentNodeResource.fetchBookmarks({ params: { limit: 25, available: true } }).then(
             data => {
-              bookmarks.value = data.results ? data.results : [];
+              const isExercise = item => item.kind === ContentNodeKinds.EXERCISE;
+              bookmarks.value = data.results ? data.results.filter(isExercise) : [];
             }
           ),
         ];
@@ -399,9 +400,7 @@
         }
         */
         if (showBookmarks.value) {
-          return bookmarks.value
-            .filter(item => item.kind === 'exercise')
-            .map(item => ({ ...item, is_leaf: true }));
+          return bookmarks.value.map(item => ({ ...item, is_leaf: true }));
         }
 
         if (searchQuery.value) {

From 82a70bc086947a9e89a3c1d86c515f3abe868684 Mon Sep 17 00:00:00 2001
From: Jacob Pierce <w.jacobpierce@gmail.com>
Date: Mon, 18 Mar 2024 13:22:44 -0700
Subject: [PATCH 44/67] confirm replacement message

---
 .../plan/CreateExamPage/ReplaceQuestions.vue  | 33 +++++++++++++++++--
 1 file changed, 30 insertions(+), 3 deletions(-)

diff --git a/kolibri/plugins/coach/assets/src/views/plan/CreateExamPage/ReplaceQuestions.vue b/kolibri/plugins/coach/assets/src/views/plan/CreateExamPage/ReplaceQuestions.vue
index ac4cc86937e..a8305788fe3 100644
--- a/kolibri/plugins/coach/assets/src/views/plan/CreateExamPage/ReplaceQuestions.vue
+++ b/kolibri/plugins/coach/assets/src/views/plan/CreateExamPage/ReplaceQuestions.vue
@@ -121,11 +121,24 @@
             :primary="true"
             :text="replaceAction$()"
             :disabled="!canProceedToReplace"
-            @click="handleReplacement"
+            @click="confirmReplacement"
           />
         </KGridItem>
       </KGrid>
     </div>
+    <KModal
+      v-if="showReplacementConfirmation"
+      :submitText="coreString('confirmAction')"
+      :cancelText="coreString('cancelAction')"
+      :title="replaceQuestions$()"
+      @cancel="showReplacementConfirmation = false"
+      @submit="handleReplacement"
+    >
+      <div> {{ replaceQuestionsExplaination$() }} </div>
+      <div style="font-weight: bold;">
+        {{ noUndoWarning$() }}
+      </div>
+    </KModal>
     <KModal
       v-if="showCloseConfirmation"
       :submitText="coreString('continueAction')"
@@ -171,6 +184,7 @@
         replaceQuestionsExplaination$,
         numberOfSelectedReplacements$,
         numberOfQuestionsReplaced$,
+        noUndoWarning$,
       } = enhancedQuizManagementStrings;
       const {
         // Computed
@@ -188,6 +202,7 @@
       } = injectQuizCreation();
 
       const showCloseConfirmation = ref(false);
+      const showReplacementConfirmation = ref(false);
 
       function handleConfirmClose() {
         context.emit('closePanel');
@@ -212,6 +227,10 @@
         });
       }
 
+      function confirmReplacement() {
+        showReplacementConfirmation.value = true;
+      }
+
       function toggleInReplacements(question) {
         const replacementIds = replacements.value.map(q => q.question_id);
         if (replacementIds.includes(question.question_id)) {
@@ -257,6 +276,8 @@
         replaceSelectedQuestions,
         activeResourceMap,
         showCloseConfirmation,
+        showReplacementConfirmation,
+        confirmReplacement,
 
         handleConfirmClose,
         clearSelectedQuestions,
@@ -268,10 +289,11 @@
         deleteSectionLabel$,
         replaceAction$,
         selectAllLabel$,
-        replaceQuestionsExplaination$,
         numberOfSelectedReplacements$,
         closeConfirmationMessage$,
         closeConfirmationTitle$,
+        noUndoWarning$,
+        replaceQuestionsExplaination$,
       };
     },
     computed: {
@@ -296,7 +318,12 @@
       },
     },
     beforeRouteLeave(_, __, next) {
-      if (!this.showCloseConfirmation && this.canProceedToReplace) {
+      if (
+        !this.showCloseConfirmation && // We aren't here because the user confirmed closing
+        !this.showReplacementConfirmation && // And they haven't confirmed replacing either
+        this.replacements.length > 0 // And there are changes to prompt about
+      ) {
+        // We show the confirmation to close and lose changes
         this.showCloseConfirmation = true;
         next(false);
       } else {

From 66fa6b1821f709a26bdd148321a7770aa105756b Mon Sep 17 00:00:00 2001
From: Jacob Pierce <w.jacobpierce@gmail.com>
Date: Mon, 18 Mar 2024 13:29:00 -0700
Subject: [PATCH 45/67] don't ask for confirmation when going to
 select-resources from section editor

---
 .../views/plan/CreateExamPage/SectionEditor.vue | 17 ++++++++++++++---
 1 file changed, 14 insertions(+), 3 deletions(-)

diff --git a/kolibri/plugins/coach/assets/src/views/plan/CreateExamPage/SectionEditor.vue b/kolibri/plugins/coach/assets/src/views/plan/CreateExamPage/SectionEditor.vue
index b30dfd0ffc5..4e0e677b4c2 100644
--- a/kolibri/plugins/coach/assets/src/views/plan/CreateExamPage/SectionEditor.vue
+++ b/kolibri/plugins/coach/assets/src/views/plan/CreateExamPage/SectionEditor.vue
@@ -125,7 +125,7 @@
 
     <KRouterLink
       appearance="raised-button"
-      :to="{ path: 'select-resources' }"
+      :to="selectResourcesRoute"
       style="margin-bottom: 1em;"
       iconAfter="forward"
     >
@@ -440,11 +440,22 @@
           backgroundColor: this.$themeTokens.surface,
         };
       },
+      selectResourcesRoute() {
+        return { name: PageNames.QUIZ_SELECT_RESOURCES };
+      },
     },
     beforeRouteLeave(to, __, next) {
       if (!this.showCloseConfirmation && this.formDataHasChanged && !this.showDeleteConfirmation) {
-        this.showCloseConfirmation = true;
-        next(false);
+        if (to.name === PageNames.QUIZ_SELECT_RESOURCES) {
+          // We're going from here to select resources so we'll save settings and move on without
+          // asking for confirmation.
+          // TODO This needs to be updated when/if "autosave" is implemented
+          this.applySettings();
+          next();
+        } else {
+          this.showCloseConfirmation = true;
+          next(false);
+        }
       } else {
         next();
       }

From b3af86d3de26b2160849aaa9c56124c76dc08139 Mon Sep 17 00:00:00 2001
From: Jacob Pierce <w.jacobpierce@gmail.com>
Date: Mon, 18 Mar 2024 13:45:02 -0700
Subject: [PATCH 46/67] selectQuestions new param "excludes" to avoid selecting
 questions already in section

---
 .../assets/src/composables/useQuizCreation.js   | 10 +++++++---
 .../coach/assets/src/utils/selectQuestions.js   | 17 +++++++++++++----
 2 files changed, 20 insertions(+), 7 deletions(-)

diff --git a/kolibri/plugins/coach/assets/src/composables/useQuizCreation.js b/kolibri/plugins/coach/assets/src/composables/useQuizCreation.js
index fcc6fb14309..a145be4445f 100644
--- a/kolibri/plugins/coach/assets/src/composables/useQuizCreation.js
+++ b/kolibri/plugins/coach/assets/src/composables/useQuizCreation.js
@@ -166,7 +166,10 @@ export default function useQuizCreation(DEBUG = false) {
         // If the question_count is being increased, we need to add new questions to the end of the
         // questions array
         const numQuestionsToAdd = question_count - (targetSection.question_count || 0);
-        const newQuestions = selectRandomQuestionsFromResources(numQuestionsToAdd);
+        const newQuestions = selectRandomQuestionsFromResources(
+          numQuestionsToAdd,
+          get(activeQuestions).map(q => q.question_id)
+        );
         updates.questions = [...targetSection.questions, ...newQuestions];
       }
     }
@@ -189,14 +192,15 @@ export default function useQuizCreation(DEBUG = false) {
    * @param numQuestions
    * @returns {QuizQuestion[]}
    */
-  function selectRandomQuestionsFromResources(numQuestions) {
+  function selectRandomQuestionsFromResources(numQuestions, excludedIds = []) {
     const pool = get(activeResourcePool);
     return selectQuestions(
       numQuestions,
       pool.map(r => r.content_id),
       pool.map(r => r.title),
       pool.map(r => r.assessmentmetadata.assessment_item_ids),
-      get(_quiz).seed
+      get(_quiz).seed,
+      excludedIds
     );
   }
 
diff --git a/kolibri/plugins/coach/assets/src/utils/selectQuestions.js b/kolibri/plugins/coach/assets/src/utils/selectQuestions.js
index 127cc593c0a..a8d22165d7d 100644
--- a/kolibri/plugins/coach/assets/src/utils/selectQuestions.js
+++ b/kolibri/plugins/coach/assets/src/utils/selectQuestions.js
@@ -29,7 +29,8 @@ export default function selectQuestions(
   exerciseIds,
   exerciseTitles,
   questionIdArrays,
-  seed
+  seed,
+  excludedQuestionIds = []
 ) {
   if (exerciseIds.length !== questionIdArrays.length) {
     logging.error('exerciseIds and questionIdArrays must have the same length');
@@ -52,14 +53,22 @@ export default function selectQuestions(
   // copy and shuffle the question IDs
   const shuffledQuestionIdArrays = questionIdArrays.map(shuffleWithSeed);
 
+  // reduced to remove excludedQuestionIds, ternary expression avoids iterating unnecessarily
+  const filteredQuestionIdArrays = !excludedQuestionIds.length
+    ? shuffledQuestionIdArrays
+    : shuffledQuestionIdArrays.reduce((acc, resourceQuestions) => {
+        acc.push(resourceQuestions.filter(qId => !excludedQuestionIds.includes(qId)));
+        return acc;
+      }, []);
+
   // fill up the output list
   let output = [];
   let i = 0;
   while (output.length < numQuestions) {
     const ri = randomIndexes[i];
     // check if we've used up all questions in one exercise
-    if (shuffledQuestionIdArrays[ri].length > 0) {
-      const qId = shuffledQuestionIdArrays[ri].pop();
+    if (filteredQuestionIdArrays[ri].length > 0) {
+      const qId = filteredQuestionIdArrays[ri].pop();
 
       // Only add the question/assessment to the list if it is not already there
       // from another identical exercise with a different exercise/node ID
@@ -70,7 +79,7 @@ export default function selectQuestions(
           title: exerciseTitles[ri],
         });
       }
-    } else if (getTotalOfQuestions(shuffledQuestionIdArrays) === 0) {
+    } else if (getTotalOfQuestions(filteredQuestionIdArrays) === 0) {
       // If there are not enough questions, then break the loop
       break;
     }

From 2d09bc0969ef0c7f8023ab28987a564526af3731 Mon Sep 17 00:00:00 2001
From: Jacob Pierce <w.jacobpierce@gmail.com>
Date: Mon, 18 Mar 2024 14:45:56 -0700
Subject: [PATCH 47/67] clarify/clean up calls to selectQuestions

---
 .../assets/src/composables/useQuizCreation.js | 24 +++++++++++++------
 1 file changed, 17 insertions(+), 7 deletions(-)

diff --git a/kolibri/plugins/coach/assets/src/composables/useQuizCreation.js b/kolibri/plugins/coach/assets/src/composables/useQuizCreation.js
index a145be4445f..e53f82106c0 100644
--- a/kolibri/plugins/coach/assets/src/composables/useQuizCreation.js
+++ b/kolibri/plugins/coach/assets/src/composables/useQuizCreation.js
@@ -194,11 +194,14 @@ export default function useQuizCreation(DEBUG = false) {
    */
   function selectRandomQuestionsFromResources(numQuestions, excludedIds = []) {
     const pool = get(activeResourcePool);
+    const exerciseIds = pool.map(r => r.content_id);
+    const exerciseTitles = pool.map(r => r.title);
+    const questionIdArrays = pool.map(r => r.assessmentmetadata.assessment_item_ids);
     return selectQuestions(
       numQuestions,
-      pool.map(r => r.content_id),
-      pool.map(r => r.title),
-      pool.map(r => r.assessmentmetadata.assessment_item_ids),
+      exerciseIds,
+      exerciseTitles,
+      questionIdArrays,
       get(_quiz).seed,
       excludedIds
     );
@@ -424,11 +427,18 @@ export default function useQuizCreation(DEBUG = false) {
    *                                      exercises */
   const activeQuestionsPool = computed(() => {
     const pool = get(activeResourcePool);
+    const numQuestions = pool.reduce(
+      (count, r) => count + r.assessmentmetadata.assessment_item_ids.length,
+      0
+    );
+    const exerciseIds = pool.map(r => r.content_id);
+    const exerciseTitles = pool.map(r => r.title);
+    const questionIdArrays = pool.map(r => r.assessmentmetadata.assessment_item_ids);
     return selectQuestions(
-      pool.reduce((count, r) => count + r.assessmentmetadata.assessment_item_ids.length, 0),
-      pool.map(r => r.content_id),
-      pool.map(r => r.title),
-      pool.map(r => r.assessmentmetadata.assessment_item_ids),
+      numQuestions,
+      exerciseIds,
+      exerciseTitles,
+      questionIdArrays,
       get(_quiz).seed
     );
   });

From ba05b3cf9a785b629cc63d9938eae82fc032de7b Mon Sep 17 00:00:00 2001
From: Jacob Pierce <w.jacobpierce@gmail.com>
Date: Mon, 18 Mar 2024 15:27:47 -0700
Subject: [PATCH 48/67] use a unique id in place of question_id throughout quiz
 creation

---
 .../src/composables/quizCreationSpecs.js      |  5 +++
 .../assets/src/composables/useQuizCreation.js | 40 +++++++++----------
 .../coach/assets/src/utils/selectQuestions.js |  1 +
 .../plan/CreateExamPage/CreateQuizSection.vue | 30 +++++++-------
 .../plan/CreateExamPage/ReplaceQuestions.vue  | 34 ++++++++--------
 5 files changed, 57 insertions(+), 53 deletions(-)

diff --git a/kolibri/plugins/coach/assets/src/composables/quizCreationSpecs.js b/kolibri/plugins/coach/assets/src/composables/quizCreationSpecs.js
index aa32c97c19d..ef2d79b035a 100644
--- a/kolibri/plugins/coach/assets/src/composables/quizCreationSpecs.js
+++ b/kolibri/plugins/coach/assets/src/composables/quizCreationSpecs.js
@@ -55,6 +55,7 @@ export const QuizExercise = {
 /**
  * @typedef  {Object} QuizQuestion         A particular question in a Quiz - aka an assessment item
  *                                         from an QuizExercise.
+ * @property {string} id                   A  ** unique **  identifier for this question
  * @property {string} exercise_id          The ID of the resource from which the question originates
  * @property {string} question_id          A *unique* identifier of this particular question within
  *                                         the quiz -- same as the `assessment_item_id`
@@ -63,6 +64,10 @@ export const QuizExercise = {
  *                                         same exercise title to differentiate them
  */
 export const QuizQuestion = {
+  id: {
+    type: String,
+    required: true,
+  },
   exercise_id: {
     type: String,
     required: true,
diff --git a/kolibri/plugins/coach/assets/src/composables/useQuizCreation.js b/kolibri/plugins/coach/assets/src/composables/useQuizCreation.js
index e53f82106c0..e1842a95aa0 100644
--- a/kolibri/plugins/coach/assets/src/composables/useQuizCreation.js
+++ b/kolibri/plugins/coach/assets/src/composables/useQuizCreation.js
@@ -46,7 +46,7 @@ export default function useQuizCreation(DEBUG = false) {
   const _activeSectionId = ref(null);
 
   /** @type {ref<String[]>}
-   * The question_ids that are currently selected for action in the active section */
+   * The QuizQuestion.id's that are currently selected for action in the active section */
   const _selectedQuestionIds = ref([]);
 
   /** @type {ref<Array>} A list of all channels available which have exercises */
@@ -75,7 +75,7 @@ export default function useQuizCreation(DEBUG = false) {
     const dummyQuestions = range(1, 100).map(i => {
       const questionOverrides = {
         exercise_id: uuidv4(),
-        question_id: uuidv4(),
+        id: uuidv4(),
         title: `Question ${i}`,
         counter_in_exercise: i,
         missing_resource: false,
@@ -86,7 +86,7 @@ export default function useQuizCreation(DEBUG = false) {
     // Create some resources that we can put into the section resource_pool arrays
     const resources = range(1, 10).map(i => {
       // Get a random set of questions to put in this resource -- note here that we're only
-      // getting the QuizQuestion.question_id, which is what we'll get from the API when fetching
+      // getting the QuizQuestion.id, which is what we'll get from the API when fetching
       // ContentNodes which are Exercises
       const sliceOfQuestions = shuffle(dummyQuestions).splice(0, 5);
       const resourceOverrides = {
@@ -95,7 +95,7 @@ export default function useQuizCreation(DEBUG = false) {
         kind: ContentNodeKinds.EXERCISE,
         is_leaf: true,
         id: uuidv4(),
-        assessment_ids: sliceOfQuestions.map(q => q.question_id),
+        assessment_ids: sliceOfQuestions.map(q => q.id),
         contentnode: uuidv4(),
       };
       return objectWithDefaults(resourceOverrides, QuizExercise);
@@ -110,7 +110,7 @@ export default function useQuizCreation(DEBUG = false) {
         acc = [
           ...acc,
           // It may not be immediately clear, but this is where we're getting the QuizQuestion objs
-          ...dummyQuestions.filter(q => resource.assessment_ids.includes(q.question_id)),
+          ...dummyQuestions.filter(q => resource.assessment_ids.includes(q.id)),
         ];
         return acc;
       }, []);
@@ -168,7 +168,7 @@ export default function useQuizCreation(DEBUG = false) {
         const numQuestionsToAdd = question_count - (targetSection.question_count || 0);
         const newQuestions = selectRandomQuestionsFromResources(
           numQuestionsToAdd,
-          get(activeQuestions).map(q => q.question_id)
+          get(activeQuestions).map(q => q.id)
         );
         updates.questions = [...targetSection.questions, ...newQuestions];
       }
@@ -341,25 +341,25 @@ export default function useQuizCreation(DEBUG = false) {
   /** @param {QuizQuestion} question
    * @affects _selectedQuestionIds - Adds question to _selectedQuestionIds if it isn't
    * there already */
-  function addQuestionToSelection(question_id) {
-    set(_selectedQuestionIds, uniq([...get(_selectedQuestionIds), question_id]));
+  function addQuestionToSelection(id) {
+    set(_selectedQuestionIds, uniq([...get(_selectedQuestionIds), id]));
   }
 
   /**
    * @param {QuizQuestion} question
    * @affects _selectedQuestionIds - Removes question from _selectedQuestionIds if it is there */
-  function removeQuestionFromSelection(question_id) {
+  function removeQuestionFromSelection(id) {
     set(
       _selectedQuestionIds,
-      get(_selectedQuestionIds).filter(id => id !== question_id)
+      get(_selectedQuestionIds).filter(_id => id !== _id)
     );
   }
 
-  function toggleQuestionInSelection(question_id) {
-    if (get(_selectedQuestionIds).includes(question_id)) {
-      removeQuestionFromSelection(question_id);
+  function toggleQuestionInSelection(id) {
+    if (get(_selectedQuestionIds).includes(id)) {
+      removeQuestionFromSelection(id);
     } else {
-      addQuestionToSelection(question_id);
+      addQuestionToSelection(id);
     }
   }
 
@@ -373,7 +373,7 @@ export default function useQuizCreation(DEBUG = false) {
     } else {
       set(
         _selectedQuestionIds,
-        get(activeQuestions).map(q => q.question_id)
+        get(activeQuestions).map(q => q.id)
       );
     }
   }
@@ -445,13 +445,13 @@ export default function useQuizCreation(DEBUG = false) {
   /** @type {ComputedRef<QuizQuestion[]>} All questions in the active section's `questions` property
    *                                      those which are currently set to be used in the section */
   const activeQuestions = computed(() => get(activeSection).questions);
-  /** @type {ComputedRef<String[]>} All question_ids the user has selected for the active section */
+  /** @type {ComputedRef<String[]>} All QuizQuestion.ids the user selected for the active section */
   const selectedActiveQuestions = computed(() => get(_selectedQuestionIds));
   /** @type {ComputedRef<QuizQuestion[]>} Questions in the active section's `resource_pool` that
    *                                         are not in `questions` */
   const replacementQuestionPool = computed(() => {
-    const activeQuestionIds = get(activeQuestions).map(q => q.question_id);
-    return get(activeQuestionsPool).filter(q => !activeQuestionIds.includes(q.question_id));
+    const activeQuestionIds = get(activeQuestions).map(q => q.id);
+    return get(activeQuestionsPool).filter(q => !activeQuestionIds.includes(q.id));
   });
   /** @type {ComputedRef<Array>} A list of all channels available which have exercises */
   const channels = computed(() => get(_channels));
@@ -466,7 +466,7 @@ export default function useQuizCreation(DEBUG = false) {
         isEqual(
           get(selectedActiveQuestions).sort(),
           get(activeQuestions)
-            .map(q => q.question_id)
+            .map(q => q.id)
             .sort()
         )
     );
@@ -478,7 +478,7 @@ export default function useQuizCreation(DEBUG = false) {
   function deleteActiveSelectedQuestions() {
     const { section_id, questions } = get(activeSection);
     const selectedIds = get(selectedActiveQuestions);
-    const newQuestions = questions.filter(q => !selectedIds.includes(q.question_id));
+    const newQuestions = questions.filter(q => !selectedIds.includes(q.id));
     updateSection({ section_id, questions: newQuestions });
     set(_selectedQuestionIds, []);
   }
diff --git a/kolibri/plugins/coach/assets/src/utils/selectQuestions.js b/kolibri/plugins/coach/assets/src/utils/selectQuestions.js
index a8d22165d7d..634f41299c4 100644
--- a/kolibri/plugins/coach/assets/src/utils/selectQuestions.js
+++ b/kolibri/plugins/coach/assets/src/utils/selectQuestions.js
@@ -76,6 +76,7 @@ export default function selectQuestions(
         output.push({
           exercise_id: exerciseIds[ri],
           question_id: qId,
+          id: `${exerciseIds[ri]}.${qId}`,
           title: exerciseTitles[ri],
         });
       }
diff --git a/kolibri/plugins/coach/assets/src/views/plan/CreateExamPage/CreateQuizSection.vue b/kolibri/plugins/coach/assets/src/views/plan/CreateExamPage/CreateQuizSection.vue
index 417061718f3..0ebeadbac1b 100644
--- a/kolibri/plugins/coach/assets/src/views/plan/CreateExamPage/CreateQuizSection.vue
+++ b/kolibri/plugins/coach/assets/src/views/plan/CreateExamPage/CreateQuizSection.vue
@@ -194,7 +194,7 @@
 
         <AccordionContainer
           :items="activeQuestions.map(i => ({
-            id: i.question_id,
+            id: i.id,
           }))"
         >
           <template #left-actions>
@@ -236,15 +236,15 @@
               >
                 <Draggable
                   v-for="(question, index) in activeQuestions"
-                  :key="`drag-${question.question_id}`"
+                  :key="`drag-${question.id}`"
                   tabindex="-1"
                   style="background: white"
                 >
                   <AccordionItem
-                    :id="question.question_id"
+                    :id="question.id"
                     :title="question.title"
                     :aria-selected="selectedActiveQuestions.includes(
-                      question.question_id
+                      question.id
                     )"
                   >
                     <template #heading="{ title }">
@@ -268,23 +268,23 @@
                         <KCheckbox
                           style="padding-left: 0.5em"
                           :checked="selectedActiveQuestions.includes(
-                            question.question_id
+                            question.id
                           )"
-                          @change="() => toggleQuestionInSelection(question.question_id)"
+                          @change="() => toggleQuestionInSelection(question.id)"
                         />
                         <KButton
                           tabindex="0"
                           appearance="basic-link"
                           :style="accordionStyleOverrides"
                           class="accordion-header-label"
-                          :aria-expanded="isItemExpanded(question.question_id)"
-                          :aria-controls="`question-panel-${question.question_id}`"
-                          @click="toggleItemState(question.question_id)"
+                          :aria-expanded="isItemExpanded(question.id)"
+                          :aria-controls="`question-panel-${question.id}`"
+                          @click="toggleItemState(question.id)"
                         >
                           <span>{{ title + " " + question.counter_in_exercise }}</span>
                           <KIcon
                             style="position: absolute; right:0; top: 0.92em"
-                            :icon="isItemExpanded(question.question_id) ?
+                            :icon="isItemExpanded(question.id) ?
                               'chevronUp' : 'chevronRight'"
                           />
                         </KButton>
@@ -292,18 +292,18 @@
                     </template>
                     <template #content>
                       <div
-                        v-if="isItemExpanded(question.question_id)"
-                        :id="`question-panel-${question.question_id}`"
-                        :ref="`question-panel-${question.question_id}`"
+                        v-if="isItemExpanded(question.id)"
+                        :id="`question-panel-${question.id}`"
+                        :ref="`question-panel-${question.id}`"
                         :style="{ userSelect: dragActive ? 'none!important' : 'text' }"
                       >
                         <ContentRenderer
-                          :ref="`contentRenderer-${question.question_id}`"
+                          :ref="`contentRenderer-${question.id}`"
                           :kind="activeResourceMap[question.exercise_id].kind"
                           :lang="activeResourceMap[question.exercise_id].lang"
                           :files="activeResourceMap[question.exercise_id].files"
                           :available="activeResourceMap[question.exercise_id].available"
-                          :itemId="question.question_id"
+                          :itemId="question.id"
                           :assessment="true"
                           :allowHints="false"
                           :interactive="false"
diff --git a/kolibri/plugins/coach/assets/src/views/plan/CreateExamPage/ReplaceQuestions.vue b/kolibri/plugins/coach/assets/src/views/plan/CreateExamPage/ReplaceQuestions.vue
index a8305788fe3..96c33da6b85 100644
--- a/kolibri/plugins/coach/assets/src/views/plan/CreateExamPage/ReplaceQuestions.vue
+++ b/kolibri/plugins/coach/assets/src/views/plan/CreateExamPage/ReplaceQuestions.vue
@@ -20,7 +20,7 @@
     </span>
     <AccordionContainer
       :items="replacementQuestionPool.map(i => ({
-        id: i.question_id,
+        id: i.id,
       }))"
     >
       <template #left-actions>
@@ -36,7 +36,7 @@
       <template #default="{ toggleItemState, isItemExpanded }">
         <AccordionItem
           v-for="(question, index) in replacementQuestionPool"
-          :id="question.question_id"
+          :id="question.id"
           :key="index"
           :title="question.title"
           :aria-selected="
@@ -49,7 +49,7 @@
             >
               <KCheckbox
                 class="accordion-checkbox"
-                :checked="replacements.map(r => r.question_id).includes(question.question_id)"
+                :checked="replacements.map(r => r.id).includes(question.id)"
                 @change="() => toggleInReplacements(question)"
               />
               <KButton
@@ -57,14 +57,14 @@
                 appearance="basic-link"
                 :style="accordionStyleOverrides"
                 class="accordion-header-label"
-                :aria-expanded="isItemExpanded(question.question_id)"
-                :aria-controls="`question-panel-${question.question_id}`"
-                @click="toggleItemState(question.question_id)"
+                :aria-expanded="isItemExpanded(question.id)"
+                :aria-controls="`question-panel-${question.id}`"
+                @click="toggleItemState(question.id)"
               >
                 <span>{{ title + " " + question.counter_in_exercise }}</span>
                 <KIcon
                   style="position: absolute; right:1em; top: 0.625em;"
-                  :icon="isItemExpanded(question.question_id) ?
+                  :icon="isItemExpanded(question.id) ?
                     'chevronUp' : 'chevronRight'"
                 />
               </KButton>
@@ -72,18 +72,18 @@
           </template>
           <template #content>
             <div
-              v-if="isItemExpanded(question.question_id)"
-              :id="`question-panel-${question.question_id}`"
-              :ref="`question-panel-${question.question_id}`"
+              v-if="isItemExpanded(question.id)"
+              :id="`question-panel-${question.id}`"
+              :ref="`question-panel-${question.id}`"
               :style="{ userSelect: dragActive ? 'none!important' : 'text' }"
             >
               <ContentRenderer
-                :ref="`contentRenderer-${question.question_id}`"
+                :ref="`contentRenderer-${question.id}`"
                 :kind="activeResourceMap[question.exercise_id].kind"
                 :lang="activeResourceMap[question.exercise_id].lang"
                 :files="activeResourceMap[question.exercise_id].files"
                 :available="activeResourceMap[question.exercise_id].available"
-                :itemId="question.question_id"
+                :itemId="question.id"
                 :assessment="true"
                 :allowHints="false"
                 :interactive="false"
@@ -213,7 +213,7 @@
       function handleReplacement() {
         const count = replacements.value.length;
         const questionsNotSelectedToBeReplaced = activeQuestions.value.filter(
-          question => !selectedActiveQuestions.value.includes(question.question_id)
+          question => !selectedActiveQuestions.value.includes(question.id)
         );
         updateSection({
           section_id: activeSection.value.section_id,
@@ -232,11 +232,9 @@
       }
 
       function toggleInReplacements(question) {
-        const replacementIds = replacements.value.map(q => q.question_id);
-        if (replacementIds.includes(question.question_id)) {
-          replacements.value = replacements.value.filter(
-            q => q.question_id !== question.question_id
-          );
+        const replacementIds = replacements.value.map(q => q.id);
+        if (replacementIds.includes(question.id)) {
+          replacements.value = replacements.value.filter(q => q.id !== question.id);
         } else {
           replacements.value.push(question);
         }

From 760327e36e9b91ba9d352f23d048cb172c06e00c Mon Sep 17 00:00:00 2001
From: Jacob Pierce <w.jacobpierce@gmail.com>
Date: Thu, 21 Mar 2024 11:17:28 -0700
Subject: [PATCH 49/67] update delimiter for unique question id

---
 kolibri/plugins/coach/assets/src/utils/selectQuestions.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/kolibri/plugins/coach/assets/src/utils/selectQuestions.js b/kolibri/plugins/coach/assets/src/utils/selectQuestions.js
index 634f41299c4..375af0b2dc4 100644
--- a/kolibri/plugins/coach/assets/src/utils/selectQuestions.js
+++ b/kolibri/plugins/coach/assets/src/utils/selectQuestions.js
@@ -76,7 +76,7 @@ export default function selectQuestions(
         output.push({
           exercise_id: exerciseIds[ri],
           question_id: qId,
-          id: `${exerciseIds[ri]}.${qId}`,
+          id: `${exerciseIds[ri]}:${qId}`,
           title: exerciseTitles[ri],
         });
       }

From f3310e2423f4796f524cdb8bc82c9d8895d4cdd3 Mon Sep 17 00:00:00 2001
From: Jacob Pierce <w.jacobpierce@gmail.com>
Date: Wed, 27 Mar 2024 16:04:01 -0700
Subject: [PATCH 50/67] fixes for questions management edge cases; fix showing
 preview (as best as possible for now)

also the `counter_in_exercise` is now associated w/ the question's index in the exercise's assessment ids list
---
 .../assets/src/composables/useQuizCreation.js | 54 +++++++++++++++----
 .../coach/assets/src/utils/selectQuestions.js | 17 +++---
 .../plan/CreateExamPage/CreateQuizSection.vue |  2 +-
 3 files changed, 52 insertions(+), 21 deletions(-)

diff --git a/kolibri/plugins/coach/assets/src/composables/useQuizCreation.js b/kolibri/plugins/coach/assets/src/composables/useQuizCreation.js
index e1842a95aa0..c0dcb8666e2 100644
--- a/kolibri/plugins/coach/assets/src/composables/useQuizCreation.js
+++ b/kolibri/plugins/coach/assets/src/composables/useQuizCreation.js
@@ -156,9 +156,28 @@ export default function useQuizCreation(DEBUG = false) {
     if (!targetSection) {
       throw new TypeError(`Section with id ${section_id} not found; cannot be updated.`);
     }
-    const { question_count } = updates;
-    if (question_count) {
-      if (question_count < (targetSection.question_count || 0)) {
+    // Make sure all questions in the an updated pool have proper unique IDs
+    const { resource_pool } = updates;
+    if (resource_pool) {
+      // This is where we annotate the resource_pool with unique question IDs that we'll use
+      // within the quiz creation editor. NOTE that this is not to be persisted to the server
+      // and ideally should be done by way of a Question class for a more consistant API
+      updates.resource_pool = resource_pool.map(resource => {
+        resource.unique_question_ids = resource.assessmentmetadata.assessment_item_ids.map(
+          id => `${resource.content_id}:${id}`
+        );
+        return resource;
+      });
+    }
+
+    /* Handle edge cases re: questions and question_count changing. When the question_count changes,
+     * we remove/add questions to match the new count. If questions are deleted, then we will
+     * update question_count accordingly. */
+    const { questions, question_count } = updates;
+    if (question_count && question_count !== questions?.length) {
+      // If the question count changed AND questions have changed, be sure they're the same length
+      // or we can add questions to match the new question_count
+      if (question_count < targetSection.question_count) {
         // If the question_count is being reduced, we need to remove any questions that are now
         // outside the bounds of the new question_count
         updates.questions = targetSection.questions.slice(0, question_count);
@@ -189,20 +208,24 @@ export default function useQuizCreation(DEBUG = false) {
   /**
    * @description Selects random questions from the active section's `resource_pool` - no side
    * effects
-   * @param numQuestions
+   * @param {Number} numQuestions
+   * @param {String[]} excludedIds A list of IDs to exclude from random selection
+   * @param {boolean} reseed - Whether to reseed the random selection - this can be useful
+   * if you're replacing one question with another to avoid an infinite loop of replacing the
+   * same two questions with each other when we have to add questions to match the question_count
    * @returns {QuizQuestion[]}
    */
-  function selectRandomQuestionsFromResources(numQuestions, excludedIds = []) {
+  function selectRandomQuestionsFromResources(numQuestions, excludedIds = [], reseed = false) {
     const pool = get(activeResourcePool);
     const exerciseIds = pool.map(r => r.content_id);
     const exerciseTitles = pool.map(r => r.title);
-    const questionIdArrays = pool.map(r => r.assessmentmetadata.assessment_item_ids);
+    const questionIdArrays = pool.map(r => r.unique_question_ids);
     return selectQuestions(
       numQuestions,
       exerciseIds,
       exerciseTitles,
       questionIdArrays,
-      get(_quiz).seed,
+      reseed ? Math.floor(Math.random() * 1000) : get(_quiz).seed,
       excludedIds
     );
   }
@@ -476,10 +499,21 @@ export default function useQuizCreation(DEBUG = false) {
 
    */
   function deleteActiveSelectedQuestions() {
-    const { section_id, questions } = get(activeSection);
+    const { section_id, questions: section_questions } = get(activeSection);
     const selectedIds = get(selectedActiveQuestions);
-    const newQuestions = questions.filter(q => !selectedIds.includes(q.id));
-    updateSection({ section_id, questions: newQuestions });
+    let questions = section_questions.filter(q => !selectedIds.includes(q.id));
+    let question_count = questions.length;
+    if (question_count === 0) {
+      // They've deleted all of the questions. We don't allow `question_count` to be 0,
+      // so we'll randomly select 1 question for the section -- pass `true` to reseed the shuffle.
+      questions = selectRandomQuestionsFromResources(1, selectedIds, true);
+      question_count = 1;
+    }
+    updateSection({
+      section_id,
+      questions,
+      question_count,
+    });
     set(_selectedQuestionIds, []);
   }
 
diff --git a/kolibri/plugins/coach/assets/src/utils/selectQuestions.js b/kolibri/plugins/coach/assets/src/utils/selectQuestions.js
index 375af0b2dc4..9781a00b60d 100644
--- a/kolibri/plugins/coach/assets/src/utils/selectQuestions.js
+++ b/kolibri/plugins/coach/assets/src/utils/selectQuestions.js
@@ -3,7 +3,6 @@ import range from 'lodash/range';
 import sumBy from 'lodash/fp/sumBy';
 import sortBy from 'lodash/sortBy';
 import shuffled from 'kolibri.utils.shuffled';
-import { annotateQuestionSourcesWithCounter } from 'kolibri.utils.exams';
 import logger from 'kolibri.lib.logging';
 
 const logging = logger.getLogger(__filename);
@@ -57,26 +56,27 @@ export default function selectQuestions(
   const filteredQuestionIdArrays = !excludedQuestionIds.length
     ? shuffledQuestionIdArrays
     : shuffledQuestionIdArrays.reduce((acc, resourceQuestions) => {
-        acc.push(resourceQuestions.filter(qId => !excludedQuestionIds.includes(qId)));
+        acc.push(resourceQuestions.filter(uId => !excludedQuestionIds.includes(uId)));
         return acc;
       }, []);
 
   // fill up the output list
-  let output = [];
+  const output = [];
   let i = 0;
   while (output.length < numQuestions) {
     const ri = randomIndexes[i];
     // check if we've used up all questions in one exercise
     if (filteredQuestionIdArrays[ri].length > 0) {
-      const qId = filteredQuestionIdArrays[ri].pop();
+      const uId = filteredQuestionIdArrays[ri].pop();
 
       // Only add the question/assessment to the list if it is not already there
       // from another identical exercise with a different exercise/node ID
-      if (!find(output, { question_id: qId })) {
+      if (!find(output, { id: uId })) {
         output.push({
+          counter_in_exercise: questionIdArrays[ri].indexOf(uId) + 1,
           exercise_id: exerciseIds[ri],
-          question_id: qId,
-          id: `${exerciseIds[ri]}:${qId}`,
+          question_id: uId.split(':')[1],
+          id: uId,
           title: exerciseTitles[ri],
         });
       }
@@ -88,9 +88,6 @@ export default function selectQuestions(
     i = (i + 1) % exerciseIds.length;
   }
 
-  // Add the counter_in_exercise field to make it match the V2 Exam specification
-  output = annotateQuestionSourcesWithCounter(output);
-
   // sort the resulting questions by exercise title
   return sortBy(output, 'title');
 }
diff --git a/kolibri/plugins/coach/assets/src/views/plan/CreateExamPage/CreateQuizSection.vue b/kolibri/plugins/coach/assets/src/views/plan/CreateExamPage/CreateQuizSection.vue
index 0ebeadbac1b..6fe3fdcb096 100644
--- a/kolibri/plugins/coach/assets/src/views/plan/CreateExamPage/CreateQuizSection.vue
+++ b/kolibri/plugins/coach/assets/src/views/plan/CreateExamPage/CreateQuizSection.vue
@@ -303,7 +303,7 @@
                           :lang="activeResourceMap[question.exercise_id].lang"
                           :files="activeResourceMap[question.exercise_id].files"
                           :available="activeResourceMap[question.exercise_id].available"
-                          :itemId="question.id"
+                          :itemId="question.question_id"
                           :assessment="true"
                           :allowHints="false"
                           :interactive="false"

From 6b09a5a8fef2d53281f9629f75247f1f9a0ca9c6 Mon Sep 17 00:00:00 2001
From: Jacob Pierce <w.jacobpierce@gmail.com>
Date: Wed, 27 Mar 2024 16:07:51 -0700
Subject: [PATCH 51/67] conditional label for resource change button in section
 editor

---
 .../src/views/plan/CreateExamPage/SectionEditor.vue | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/kolibri/plugins/coach/assets/src/views/plan/CreateExamPage/SectionEditor.vue b/kolibri/plugins/coach/assets/src/views/plan/CreateExamPage/SectionEditor.vue
index 4e0e677b4c2..88055ca7af3 100644
--- a/kolibri/plugins/coach/assets/src/views/plan/CreateExamPage/SectionEditor.vue
+++ b/kolibri/plugins/coach/assets/src/views/plan/CreateExamPage/SectionEditor.vue
@@ -129,7 +129,7 @@
       style="margin-bottom: 1em;"
       iconAfter="forward"
     >
-      {{ changeResources$() }}
+      {{ resourceButtonLabel }}
     </KRouterLink>
 
     <hr :style="dividerStyle">
@@ -301,6 +301,7 @@
         closeConfirmationTitle$,
         deleteConfirmation$,
         changesSavedSuccessfully$,
+        selectResourcesFromChannels$,
         sectionDeletedNotification$,
       } = enhancedQuizManagementStrings;
 
@@ -368,6 +369,14 @@
 
       const { windowIsLarge, windowIsSmall } = useKResponsiveWindow();
 
+      const resourceButtonLabel = computed(() => {
+        if (activeResourcePool.value.length === 0) {
+          return selectResourcesFromChannels$();
+        } else {
+          return changeResources$();
+        }
+      });
+
       return {
         formDataHasChanged,
         showCloseConfirmation,
@@ -389,10 +398,12 @@
         question_count,
         description,
         section_title,
+        resourceButtonLabel,
         // Responsiveness
         windowIsLarge,
         windowIsSmall,
         // i18n
+        selectResourcesFromChannels$,
         sectionSettings$,
         sectionTitle$,
         numberOfQuestionsLabel$,

From 236d309b1471f408e1e7dd40d4f106d453b00163 Mon Sep 17 00:00:00 2001
From: Jacob Pierce <w.jacobpierce@gmail.com>
Date: Wed, 27 Mar 2024 16:30:57 -0700
Subject: [PATCH 52/67] update questions more reliably

---
 .../assets/src/composables/useQuizCreation.js | 34 ++++++++++++-------
 1 file changed, 22 insertions(+), 12 deletions(-)

diff --git a/kolibri/plugins/coach/assets/src/composables/useQuizCreation.js b/kolibri/plugins/coach/assets/src/composables/useQuizCreation.js
index c0dcb8666e2..8e9f973ac64 100644
--- a/kolibri/plugins/coach/assets/src/composables/useQuizCreation.js
+++ b/kolibri/plugins/coach/assets/src/composables/useQuizCreation.js
@@ -8,7 +8,7 @@ import { ContentNodeKinds } from 'kolibri.coreVue.vuex.constants';
 import { ChannelResource, ExamResource } from 'kolibri.resources';
 import { validateObject, objectWithDefaults } from 'kolibri.utils.objectSpecs';
 import { get, set } from '@vueuse/core';
-import { computed, ref, watch, provide, inject } from 'kolibri.lib.vueCompositionApi';
+import { computed, ref, provide, inject } from 'kolibri.lib.vueCompositionApi';
 import logging from 'kolibri.lib.logging';
 // TODO: Probably move this to this file's local dir
 import selectQuestions from '../utils/selectQuestions.js';
@@ -168,13 +168,17 @@ export default function useQuizCreation(DEBUG = false) {
         );
         return resource;
       });
+      // These are set into the updates so that questions are populated when the resource_pool
+      // changes
+      updates.questions = [];
     }
 
     /* Handle edge cases re: questions and question_count changing. When the question_count changes,
      * we remove/add questions to match the new count. If questions are deleted, then we will
      * update question_count accordingly. */
     const { questions, question_count } = updates;
-    if (question_count && question_count !== questions?.length) {
+
+    if (question_count !== questions?.length) {
       // If the question count changed AND questions have changed, be sure they're the same length
       // or we can add questions to match the new question_count
       if (question_count < targetSection.question_count) {
@@ -203,6 +207,22 @@ export default function useQuizCreation(DEBUG = false) {
         return section;
       }),
     });
+    if (questions?.length === 0 && resource_pool?.length) {
+      // We have no questions but have updated the resource_pool, so now let's set the questions.
+      // This is happening here because we have to persist the resource_pool so that we can select
+      // questions from it.
+      const questions = selectRandomQuestionsFromResources(targetSection.question_count);
+      set(_quiz, {
+        ...get(quiz),
+        // Update matching QuizSections with the updates object
+        question_sources: get(allSections).map(section => {
+          if (section.section_id === section_id) {
+            return { ...section, questions };
+          }
+          return section;
+        }),
+      });
+    }
   }
 
   /**
@@ -301,16 +321,6 @@ export default function useQuizCreation(DEBUG = false) {
       setActiveSection(newSection.section_id);
     }
     _fetchChannels();
-
-    // Set watcher once we have a section in place
-    watch(activeResourcePool, (resourcePool, old) => {
-      if (!isEqual(resourcePool, old)) {
-        updateSection({
-          section_id: get(_activeSectionId),
-          questions: selectRandomQuestionsFromResources(get(activeSection).question_count),
-        });
-      }
-    });
   }
 
   /**

From 531d375805b6b04841d95a842efce26fd816523b Mon Sep 17 00:00:00 2001
From: Jacob Pierce <w.jacobpierce@gmail.com>
Date: Fri, 29 Mar 2024 15:13:57 -0700
Subject: [PATCH 53/67] use unique_id_arrays while generating list of
 activequestions

---
 kolibri/plugins/coach/assets/src/composables/useQuizCreation.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/kolibri/plugins/coach/assets/src/composables/useQuizCreation.js b/kolibri/plugins/coach/assets/src/composables/useQuizCreation.js
index 8e9f973ac64..c1586c15973 100644
--- a/kolibri/plugins/coach/assets/src/composables/useQuizCreation.js
+++ b/kolibri/plugins/coach/assets/src/composables/useQuizCreation.js
@@ -466,7 +466,7 @@ export default function useQuizCreation(DEBUG = false) {
     );
     const exerciseIds = pool.map(r => r.content_id);
     const exerciseTitles = pool.map(r => r.title);
-    const questionIdArrays = pool.map(r => r.assessmentmetadata.assessment_item_ids);
+    const questionIdArrays = pool.map(r => r.unique_question_ids);
     return selectQuestions(
       numQuestions,
       exerciseIds,

From 85c20b7ccfe71751b2f7731be01fffc02f9fdbe4 Mon Sep 17 00:00:00 2001
From: Jacob Pierce <w.jacobpierce@gmail.com>
Date: Fri, 29 Mar 2024 15:52:19 -0700
Subject: [PATCH 54/67] remove unnecessary select questions test

The test here was previously accounting for a possibility where the same resource from a different channel was being used -- however, we only select questions now by using a fully unique ID combining the exercise_id:question_id so this test is no longer needed
---
 .../assets/test/selectRandomExamQuestions.spec.js   | 13 -------------
 1 file changed, 13 deletions(-)

diff --git a/kolibri/plugins/coach/assets/test/selectRandomExamQuestions.spec.js b/kolibri/plugins/coach/assets/test/selectRandomExamQuestions.spec.js
index efb9331c85c..cbcc96f3ff2 100644
--- a/kolibri/plugins/coach/assets/test/selectRandomExamQuestions.spec.js
+++ b/kolibri/plugins/coach/assets/test/selectRandomExamQuestions.spec.js
@@ -1,4 +1,3 @@
-import filter from 'lodash/filter';
 import selectQuestions from '../src/utils/selectQuestions';
 
 jest.mock('kolibri.lib.logging');
@@ -84,16 +83,4 @@ describe('selectQuestions function', () => {
     const output2 = selectQuestions(numQs, EXERCISES_IDS, EXERCISES_TITLES, QUESTION_IDS, 2);
     expect(output1).not.toEqual(output2);
   });
-
-  it('will not add the same question twice', () => {
-    // Two copies of the same exercise, and a numQuestions that would previously
-    // force duplicates.
-    const exerciseIds = ['C1', 'C2'];
-    const titles = ['original c', 'copy of c'];
-    const assessments = ['A1', 'A2'];
-    const questionIds = [assessments, assessments];
-    const output = selectQuestions(4, exerciseIds, titles, questionIds, 1);
-    expect(filter(output, { question_id: 'A1' })).toHaveLength(1);
-    expect(filter(output, { question_id: 'A2' })).toHaveLength(1);
-  });
 });

From f8a690a5428425f8f7b24355f26a809fce564734 Mon Sep 17 00:00:00 2001
From: Jacob Pierce <w.jacobpierce@gmail.com>
Date: Fri, 29 Mar 2024 10:49:54 -0700
Subject: [PATCH 55/67] update homehydrate viewset to account for Exam v3

---
 kolibri/plugins/learn/viewsets.py | 21 +++++++++++++++++----
 1 file changed, 17 insertions(+), 4 deletions(-)

diff --git a/kolibri/plugins/learn/viewsets.py b/kolibri/plugins/learn/viewsets.py
index ace4ba5a449..4fb2868418a 100644
--- a/kolibri/plugins/learn/viewsets.py
+++ b/kolibri/plugins/learn/viewsets.py
@@ -182,15 +182,28 @@ def consolidate(self, items, queryset):
                 "title",
                 "closed",
                 "answer_count",
+                "data_model_version",
                 "score",
                 "question_sources",
             )
         )
         exam_node_ids = set()
+        section_questions = list()
+
         for exam in exams:
-            exam_node_ids |= {
-                question["exercise_id"] for question in exam.get("question_sources")
-            }
+            if exam.get("data_model_version", 0) >= 3:
+                for section in exam.get("question_sources"):
+                    questions = section.get("questions", [])
+                    section_questions.extend(questions)
+
+                exam_node_ids |= {
+                    question["exercise_id"] for question in section_questions
+                }
+            else:
+                # OR WE COULD DO A MIGRATION TO UPDATE THE DATA
+                exam_node_ids |= {
+                    question["exercise_id"] for question in exam.get("question_sources")
+                }
 
         available_exam_ids = set(
             ContentNode.objects.filter_by_uuids(exam_node_ids).values_list(
@@ -218,7 +231,7 @@ def consolidate(self, items, queryset):
                 }
             exam["missing_resource"] = any(
                 question["exercise_id"] not in available_exam_ids
-                for question in exam.get("question_sources")
+                for question in (section_questions or exam.get("question_sources"))
             )
         out_items = []
         for item in items:

From 7e8c4a3cbcb4e0944a3045d276305076357ad379 Mon Sep 17 00:00:00 2001
From: Jacob Pierce <w.jacobpierce@gmail.com>
Date: Tue, 2 Apr 2024 14:07:46 -0700
Subject: [PATCH 56/67] use proper node id for exercise_id, proper data_model
 property in examViewer module

---
 .../coach/assets/src/composables/useQuizCreation.js |  2 +-
 .../learn/assets/src/modules/examViewer/handlers.js | 13 ++++++++-----
 2 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/kolibri/plugins/coach/assets/src/composables/useQuizCreation.js b/kolibri/plugins/coach/assets/src/composables/useQuizCreation.js
index c1586c15973..6a9be2595e1 100644
--- a/kolibri/plugins/coach/assets/src/composables/useQuizCreation.js
+++ b/kolibri/plugins/coach/assets/src/composables/useQuizCreation.js
@@ -164,7 +164,7 @@ export default function useQuizCreation(DEBUG = false) {
       // and ideally should be done by way of a Question class for a more consistant API
       updates.resource_pool = resource_pool.map(resource => {
         resource.unique_question_ids = resource.assessmentmetadata.assessment_item_ids.map(
-          id => `${resource.content_id}:${id}`
+          question_id => `${resource.id}:${question_id}`
         );
         return resource;
       });
diff --git a/kolibri/plugins/learn/assets/src/modules/examViewer/handlers.js b/kolibri/plugins/learn/assets/src/modules/examViewer/handlers.js
index 9ec709b726a..c35dfe4ea0d 100644
--- a/kolibri/plugins/learn/assets/src/modules/examViewer/handlers.js
+++ b/kolibri/plugins/learn/assets/src/modules/examViewer/handlers.js
@@ -1,4 +1,5 @@
 import { ContentNodeResource, ExamResource } from 'kolibri.resources';
+import uniq from 'lodash/uniq';
 import samePageCheckGenerator from 'kolibri.utils.samePageCheckGenerator';
 import { convertExamQuestionSourcesToV3 } from 'kolibri.utils.exams';
 import shuffled from 'kolibri.utils.shuffled';
@@ -31,11 +32,13 @@ export function showExam(store, params, alreadyOnQuiz) {
 
           let contentPromise;
           let allExerciseIds = [];
-          if (exam.data_version == 3) {
-            allExerciseIds = exam.question_sources.reduce((acc, section) => {
-              acc = [...acc, ...section.questions.map(q => q.exercise_id)];
-              return acc;
-            }, []);
+          if (exam.data_model_version == 3) {
+            allExerciseIds = uniq(
+              exam.question_sources.reduce((acc, section) => {
+                acc = [...acc, ...section.questions.map(q => q.exercise_id)];
+                return acc;
+              }, [])
+            );
           } else {
             allExerciseIds = exam.question_sources.map(q => q.exercise_id);
           }

From 00de4e8e1a170cc1ecd7d274593b8268e1832302 Mon Sep 17 00:00:00 2001
From: Jacob Pierce <w.jacobpierce@gmail.com>
Date: Tue, 2 Apr 2024 15:03:07 -0700
Subject: [PATCH 57/67] use exam_assignment_lookup for cleaner itearator

---
 kolibri/plugins/learn/viewsets.py | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/kolibri/plugins/learn/viewsets.py b/kolibri/plugins/learn/viewsets.py
index 4fb2868418a..b1feadd3b00 100644
--- a/kolibri/plugins/learn/viewsets.py
+++ b/kolibri/plugins/learn/viewsets.py
@@ -16,6 +16,7 @@
 from kolibri.core.content.api import UserContentNodeViewset
 from kolibri.core.content.models import ContentNode
 from kolibri.core.exams.models import Exam
+from kolibri.core.exams.models import exam_assignment_lookup
 from kolibri.core.lessons.models import Lesson
 from kolibri.core.logger.models import AttemptLog
 from kolibri.core.logger.models import MasteryLog
@@ -197,10 +198,12 @@ def consolidate(self, items, queryset):
                     section_questions.extend(questions)
 
                 exam_node_ids |= {
-                    question["exercise_id"] for question in section_questions
+                    exercise_id
+                    for exercise_id, _ in exam_assignment_lookup(
+                        exam.get("question_sources", [])
+                    )
                 }
             else:
-                # OR WE COULD DO A MIGRATION TO UPDATE THE DATA
                 exam_node_ids |= {
                     question["exercise_id"] for question in exam.get("question_sources")
                 }

From fac5ef746c040234e14af0a7e6cd1dd4bf06ef54 Mon Sep 17 00:00:00 2001
From: Jacob Pierce <w.jacobpierce@gmail.com>
Date: Thu, 4 Apr 2024 13:40:34 -0700
Subject: [PATCH 58/67] use exam_assignment_lookup throughout as it is itself
 backwardcompatible

---
 kolibri/plugins/learn/viewsets.py | 28 ++++++++++------------------
 1 file changed, 10 insertions(+), 18 deletions(-)

diff --git a/kolibri/plugins/learn/viewsets.py b/kolibri/plugins/learn/viewsets.py
index b1feadd3b00..fce580c6878 100644
--- a/kolibri/plugins/learn/viewsets.py
+++ b/kolibri/plugins/learn/viewsets.py
@@ -189,24 +189,14 @@ def consolidate(self, items, queryset):
             )
         )
         exam_node_ids = set()
-        section_questions = list()
 
         for exam in exams:
-            if exam.get("data_model_version", 0) >= 3:
-                for section in exam.get("question_sources"):
-                    questions = section.get("questions", [])
-                    section_questions.extend(questions)
-
-                exam_node_ids |= {
-                    exercise_id
-                    for exercise_id, _ in exam_assignment_lookup(
-                        exam.get("question_sources", [])
-                    )
-                }
-            else:
-                exam_node_ids |= {
-                    question["exercise_id"] for question in exam.get("question_sources")
-                }
+            exam_node_ids |= {
+                exercise_id
+                for exercise_id, _ in exam_assignment_lookup(
+                    exam.get("question_sources", [])
+                )
+            }
 
         available_exam_ids = set(
             ContentNode.objects.filter_by_uuids(exam_node_ids).values_list(
@@ -233,8 +223,10 @@ def consolidate(self, items, queryset):
                     "started": False,
                 }
             exam["missing_resource"] = any(
-                question["exercise_id"] not in available_exam_ids
-                for question in (section_questions or exam.get("question_sources"))
+                exercise_id not in available_exam_ids
+                for exercise_id, _ in exam_assignment_lookup(
+                    exam.get("question_sources", [])
+                )
             )
         out_items = []
         for item in items:

From 843271dcae43562040567328bac97802ec2d824a Mon Sep 17 00:00:00 2001
From: Jacob Pierce <w.jacobpierce@gmail.com>
Date: Thu, 4 Apr 2024 13:45:47 -0700
Subject: [PATCH 59/67] remove outdated/unnecessary DEBUG functionality from
 useQuizCreation

---
 .../assets/src/composables/useQuizCreation.js | 103 +-----------------
 1 file changed, 4 insertions(+), 99 deletions(-)

diff --git a/kolibri/plugins/coach/assets/src/composables/useQuizCreation.js b/kolibri/plugins/coach/assets/src/composables/useQuizCreation.js
index 6a9be2595e1..c2d855847f5 100644
--- a/kolibri/plugins/coach/assets/src/composables/useQuizCreation.js
+++ b/kolibri/plugins/coach/assets/src/composables/useQuizCreation.js
@@ -1,7 +1,5 @@
 import { v4 } from 'uuid';
 import isEqual from 'lodash/isEqual';
-import range from 'lodash/range';
-import shuffle from 'lodash/shuffle';
 import { enhancedQuizManagementStrings } from 'kolibri-common/strings/enhancedQuizManagementStrings';
 import uniq from 'lodash/uniq';
 import { ContentNodeKinds } from 'kolibri.coreVue.vuex.constants';
@@ -9,12 +7,9 @@ import { ChannelResource, ExamResource } from 'kolibri.resources';
 import { validateObject, objectWithDefaults } from 'kolibri.utils.objectSpecs';
 import { get, set } from '@vueuse/core';
 import { computed, ref, provide, inject } from 'kolibri.lib.vueCompositionApi';
-import logging from 'kolibri.lib.logging';
 // TODO: Probably move this to this file's local dir
 import selectQuestions from '../utils/selectQuestions.js';
-import { Quiz, QuizSection, QuizQuestion, QuizExercise } from './quizCreationSpecs.js';
-
-const logger = logging.getLogger(__filename);
+import { Quiz, QuizSection } from './quizCreationSpecs.js';
 
 function uuidv4() {
   return v4().replace(/-/g, '');
@@ -32,7 +27,7 @@ function validateQuiz(quiz) {
 /**
  * Composable function presenting primary interface for Quiz Creation
  */
-export default function useQuizCreation(DEBUG = false) {
+export default function useQuizCreation() {
   // -----------
   // Local state
   // -----------
@@ -55,92 +50,6 @@ export default function useQuizCreation(DEBUG = false) {
   /** @type {ref<Number>} A counter for use in naming new sections */
   const _sectionLabelCounter = ref(1);
 
-  /**
-   * DEBUG Data
-   *
-   * Generates a test quiz with multiple sections. It generates properly shaped QuizExercise type
-   * and QuizQuestion type objects, but the content is not real.
-   *
-   * This should be suitable for all UI testing purposes EXCEPT for resource selection.
-   * DO NOT use this if you're testing resource selection or want to use real resources.
-   */
-  function _generateTestData() {
-    if (process.env.NODE_ENV === 'production') {
-      logger.error("You're trying to generate test data in production. Please set DEBUG = false.");
-    }
-    /**
-     * @type {QuizQuestion[]} - dummyQuestions
-     * Typically this data would be fetched and usable from the useExerciseResources module.
-     */
-    const dummyQuestions = range(1, 100).map(i => {
-      const questionOverrides = {
-        exercise_id: uuidv4(),
-        id: uuidv4(),
-        title: `Question ${i}`,
-        counter_in_exercise: i,
-        missing_resource: false,
-      };
-      return objectWithDefaults(questionOverrides, QuizQuestion);
-    });
-
-    // Create some resources that we can put into the section resource_pool arrays
-    const resources = range(1, 10).map(i => {
-      // Get a random set of questions to put in this resource -- note here that we're only
-      // getting the QuizQuestion.id, which is what we'll get from the API when fetching
-      // ContentNodes which are Exercises
-      const sliceOfQuestions = shuffle(dummyQuestions).splice(0, 5);
-      const resourceOverrides = {
-        title: `Resource ${i}`,
-        content_id: uuidv4(),
-        kind: ContentNodeKinds.EXERCISE,
-        is_leaf: true,
-        id: uuidv4(),
-        assessment_ids: sliceOfQuestions.map(q => q.id),
-        contentnode: uuidv4(),
-      };
-      return objectWithDefaults(resourceOverrides, QuizExercise);
-    });
-
-    const sections = range(1, 5).map(i => {
-      const resource_pool = shuffle(resources).slice(0, 3);
-      // We'll reduce the resource_pool down to a list of QuizQuestion typed objects in order to
-      // imitate what we'll otherwise get from a separate module which will handle the API calls
-      // Typically the question_pool will be set whenever the resource_pool changes
-      const question_pool = resource_pool.reduce((acc, resource) => {
-        acc = [
-          ...acc,
-          // It may not be immediately clear, but this is where we're getting the QuizQuestion objs
-          ...dummyQuestions.filter(q => resource.assessment_ids.includes(q.id)),
-        ];
-        return acc;
-      }, []);
-
-      // These will be the questions that are currently "in the section" -- that is, the questions
-      // which could possibly be deleted from the section (which will affect the question_count)
-      // or replaced with other questions from the question_pool
-      const questions = question_pool.slice(0, 5);
-
-      const sectionOverrides = {
-        section_id: uuidv4(),
-        section_title: `Section ${i}`,
-        description: `Section ${i} description`,
-        question_count: questions.length,
-        questions,
-        resource_pool,
-        question_pool,
-      };
-
-      return objectWithDefaults(sectionOverrides, QuizSection);
-    });
-
-    logger.log('Generated DEBUG dummyQuestions', dummyQuestions);
-    logger.log('Generated DEBUG resources', resources);
-    logger.log('Generated DEBUG sections', sections);
-
-    // Now we're committing this all ot the _quiz ref from which reactive properties will derive
-    updateQuiz({ question_sources: sections });
-    setActiveSection(sections[0].section_id);
-  }
   // ------------------
   // Section Management
   // ------------------
@@ -314,12 +223,8 @@ export default function useQuizCreation(DEBUG = false) {
 
   function initializeQuiz(collection) {
     set(_quiz, objectWithDefaults({ collection }, Quiz));
-    if (DEBUG) {
-      _generateTestData();
-    } else {
-      const newSection = addSection();
-      setActiveSection(newSection.section_id);
-    }
+    const newSection = addSection();
+    setActiveSection(newSection.section_id);
     _fetchChannels();
   }
 

From b600ee2d63ce8c236802effe9b299f54c0f1de5c Mon Sep 17 00:00:00 2001
From: Jacob Pierce <w.jacobpierce@gmail.com>
Date: Tue, 9 Apr 2024 14:28:06 -0700
Subject: [PATCH 60/67] update quiz creation specs to clarify exercise_id
 origin

---
 .../coach/assets/src/composables/quizCreationSpecs.js  | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/kolibri/plugins/coach/assets/src/composables/quizCreationSpecs.js b/kolibri/plugins/coach/assets/src/composables/quizCreationSpecs.js
index ef2d79b035a..6d81c1ad8c8 100644
--- a/kolibri/plugins/coach/assets/src/composables/quizCreationSpecs.js
+++ b/kolibri/plugins/coach/assets/src/composables/quizCreationSpecs.js
@@ -9,28 +9,28 @@
 /**
  * @typedef   {Object}  QuizExercise    An object referencing an exercise or topic to be used
  *                                      within the `QuizSeciton.resource_pool` property.
+ * @property  {string}  id              Unique ID for this exercise (aka, `exercise_id` elsewhere)
  * @property  {string}  title           The resource title
  * @property  {string}  ancestor_id     The ID of the parent contentnode
  * @property  {string}  content_id      The ID for the piece of content
- * @property  {string}  id              Unique ID for this exercise
  * @property  {bool}    is_leaf         Whether or not this is a leaf node (i.e. an exercise)
  * @property  {string}  kind            Exercise or Topic in our case - see: `ContentNodeKinds`
  */
 
 export const QuizExercise = {
-  title: {
+  id: {
     type: String,
     default: '',
   },
-  ancestor_id: {
+  title: {
     type: String,
     default: '',
   },
-  content_id: {
+  ancestor_id: {
     type: String,
     default: '',
   },
-  id: {
+  content_id: {
     type: String,
     default: '',
   },

From 5b1472e9e64b16b3de03895a2ed249b8302d3403 Mon Sep 17 00:00:00 2001
From: Jacob Pierce <w.jacobpierce@gmail.com>
Date: Tue, 9 Apr 2024 14:41:33 -0700
Subject: [PATCH 61/67] add unique_question_ids to resources when they're saved
 in the first place

---
 .../plan/CreateExamPage/ResourceSelection.vue      | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/kolibri/plugins/coach/assets/src/views/plan/CreateExamPage/ResourceSelection.vue b/kolibri/plugins/coach/assets/src/views/plan/CreateExamPage/ResourceSelection.vue
index e4ec2046f80..33764ef88da 100644
--- a/kolibri/plugins/coach/assets/src/views/plan/CreateExamPage/ResourceSelection.vue
+++ b/kolibri/plugins/coach/assets/src/views/plan/CreateExamPage/ResourceSelection.vue
@@ -576,7 +576,19 @@
       saveSelectedResource() {
         this.updateSection({
           section_id: this.$route.params.section_id,
-          resource_pool: this.workingResourcePool,
+          resource_pool: this.workingResourcePool.map(resource => {
+            // Add the unique_question_ids to the resource
+            const unique_question_ids = resource.assessmentmetadata.assessment_item_ids.map(
+              question_id => {
+                return `${resource.id}:${question_id}`;
+              }
+            );
+
+            return {
+              ...resource,
+              unique_question_ids,
+            };
+          }),
         });
 
         this.resetWorkingResourcePool();

From 0dda9694299986afe290a6d64800c7124cd93baf Mon Sep 17 00:00:00 2001
From: Jacob Pierce <w.jacobpierce@gmail.com>
Date: Tue, 9 Apr 2024 14:48:10 -0700
Subject: [PATCH 62/67] properly handle resource_pool, question and
 question_count updates

this was kind of a pain to work out, ultimately, the method to select random questions
needed to take a parameter for the resource_pool it will select from.
this implementation results in a massive updateSection method. an ideal alternative
would probably involve changes to the API overall, which would require a moderate refactor
but would also likely result in a much cleaner interface
---
 .../assets/src/composables/useQuizCreation.js | 119 ++++++++++--------
 1 file changed, 70 insertions(+), 49 deletions(-)

diff --git a/kolibri/plugins/coach/assets/src/composables/useQuizCreation.js b/kolibri/plugins/coach/assets/src/composables/useQuizCreation.js
index c2d855847f5..5cd8fc0a185 100644
--- a/kolibri/plugins/coach/assets/src/composables/useQuizCreation.js
+++ b/kolibri/plugins/coach/assets/src/composables/useQuizCreation.js
@@ -33,7 +33,8 @@ export default function useQuizCreation() {
   // -----------
 
   /** @type {ref<Quiz>}
-   * The "source of truth" quiz object from which all reactive properties should derive */
+   * The "source of truth" quiz object from which all reactive properties should derive
+   * This will be validated and sent to the API when the user saves the quiz */
   const _quiz = ref(objectWithDefaults({}, Quiz));
 
   /** @type {ref<QuizSection>}
@@ -65,42 +66,78 @@ export default function useQuizCreation() {
     if (!targetSection) {
       throw new TypeError(`Section with id ${section_id} not found; cannot be updated.`);
     }
-    // Make sure all questions in the an updated pool have proper unique IDs
-    const { resource_pool } = updates;
-    if (resource_pool) {
-      // This is where we annotate the resource_pool with unique question IDs that we'll use
-      // within the quiz creation editor. NOTE that this is not to be persisted to the server
-      // and ideally should be done by way of a Question class for a more consistant API
-      updates.resource_pool = resource_pool.map(resource => {
-        resource.unique_question_ids = resource.assessmentmetadata.assessment_item_ids.map(
-          question_id => `${resource.id}:${question_id}`
-        );
-        return resource;
-      });
-      // These are set into the updates so that questions are populated when the resource_pool
-      // changes
+
+    // og* variables are the original values of the properties we're updating
+    const {
+      resource_pool: ogResourcePool,
+      questions: ogQuestions,
+      question_count: ogQuestionCount,
+    } = targetSection;
+
+    const { resource_pool, question_count } = updates;
+
+    if (resource_pool?.length === 0) {
+      // The user has removed all resources from the section, so we can clear all questions too
       updates.questions = [];
     }
+    if (resource_pool?.length > 0) {
+      // The resource_pool is being updated
+      if (ogResourcePool.length === 0) {
+        // We're adding resources to a section which didn't previously have any
+
+        // ***
+        // Note that we're basically assuming that `questions*` properties aren't being updated --
+        // meaning we expect that we can only update one or the other of `resource_pool` and
+        // `questions*` at a time. We can safely assume this because there can't be questions
+        // if there weren't resources in the ogResourcePool before.
+        // ***
+        updates.questions = selectRandomQuestionsFromResources(
+          question_count || ogQuestionCount,
+          resource_pool
+        );
+      } else {
+        // In this case, we already had resources in the section, so we need to handle the
+        // case where a resource has been removed so that we remove & replace the questions
+        const removedResourceQuestionIds = ogResourcePool.reduce((questionIds, ogResource) => {
+          if (!resource_pool.map(r => r.id).includes(ogResource.id)) {
+            // If the resource_pool doesn't have the ogResource, we're removing it
+            questionIds = [...questionIds, ...ogResource.unique_question_ids];
+            return questionIds;
+          }
+          return questionIds;
+        }, []);
+        if (removedResourceQuestionIds.length === 0) {
+          // If no resources were removed, we don't need to update the questions
+          return;
+        }
+        const questionsToKeep = ogQuestions.filter(q => !removedResourceQuestionIds.includes(q.id));
+        const numReplacementsNeeded = (question_count || ogQuestionCount) - questionsToKeep.length;
+        updates.questions = [
+          ...questionsToKeep,
+          ...selectRandomQuestionsFromResources(numReplacementsNeeded, resource_pool),
+        ];
+      }
+    } else if (question_count !== ogQuestionCount) {
+      /**
+       * Handle edge cases re: questions and question_count changing. When the question_count
+       * changes, we remove/add questions to match the new count. If questions are deleted, then
+       * we will update question_count accordingly.
+       **/
 
-    /* Handle edge cases re: questions and question_count changing. When the question_count changes,
-     * we remove/add questions to match the new count. If questions are deleted, then we will
-     * update question_count accordingly. */
-    const { questions, question_count } = updates;
-
-    if (question_count !== questions?.length) {
       // If the question count changed AND questions have changed, be sure they're the same length
       // or we can add questions to match the new question_count
-      if (question_count < targetSection.question_count) {
+      if (question_count < ogQuestionCount) {
         // If the question_count is being reduced, we need to remove any questions that are now
         // outside the bounds of the new question_count
-        updates.questions = targetSection.questions.slice(0, question_count);
-      } else if (question_count > (targetSection.question_count || 0)) {
+        updates.questions = ogQuestions.slice(0, question_count);
+      } else if (question_count > ogQuestionCount) {
         // If the question_count is being increased, we need to add new questions to the end of the
         // questions array
-        const numQuestionsToAdd = question_count - (targetSection.question_count || 0);
+        const numQuestionsToAdd = question_count - ogQuestionCount;
         const newQuestions = selectRandomQuestionsFromResources(
           numQuestionsToAdd,
-          get(activeQuestions).map(q => q.id)
+          ogResourcePool,
+          ogQuestions.map(q => q.id) // Exclude questions we already have to avoid duplicates
         );
         updates.questions = [...targetSection.questions, ...newQuestions];
       }
@@ -116,36 +153,20 @@ export default function useQuizCreation() {
         return section;
       }),
     });
-    if (questions?.length === 0 && resource_pool?.length) {
-      // We have no questions but have updated the resource_pool, so now let's set the questions.
-      // This is happening here because we have to persist the resource_pool so that we can select
-      // questions from it.
-      const questions = selectRandomQuestionsFromResources(targetSection.question_count);
-      set(_quiz, {
-        ...get(quiz),
-        // Update matching QuizSections with the updates object
-        question_sources: get(allSections).map(section => {
-          if (section.section_id === section_id) {
-            return { ...section, questions };
-          }
-          return section;
-        }),
-      });
-    }
   }
 
   /**
    * @description Selects random questions from the active section's `resource_pool` - no side
    * effects
    * @param {Number} numQuestions
+   * @param {QuizExercise[]} pool The resource pool to select questions from, will default to
+   *  the activeResourcePool's value if not provided. This is useful if you need to select questions
+   *  from a resource pool that hasn't been committed to the section yet.
    * @param {String[]} excludedIds A list of IDs to exclude from random selection
-   * @param {boolean} reseed - Whether to reseed the random selection - this can be useful
-   * if you're replacing one question with another to avoid an infinite loop of replacing the
-   * same two questions with each other when we have to add questions to match the question_count
    * @returns {QuizQuestion[]}
    */
-  function selectRandomQuestionsFromResources(numQuestions, excludedIds = [], reseed = false) {
-    const pool = get(activeResourcePool);
+  function selectRandomQuestionsFromResources(numQuestions, pool = [], excludedIds = []) {
+    pool = pool.length ? pool : get(activeResourcePool);
     const exerciseIds = pool.map(r => r.content_id);
     const exerciseTitles = pool.map(r => r.title);
     const questionIdArrays = pool.map(r => r.unique_question_ids);
@@ -154,7 +175,7 @@ export default function useQuizCreation() {
       exerciseIds,
       exerciseTitles,
       questionIdArrays,
-      reseed ? Math.floor(Math.random() * 1000) : get(_quiz).seed,
+      Math.floor(Math.random() * 1000),
       excludedIds
     );
   }
@@ -421,7 +442,7 @@ export default function useQuizCreation() {
     if (question_count === 0) {
       // They've deleted all of the questions. We don't allow `question_count` to be 0,
       // so we'll randomly select 1 question for the section -- pass `true` to reseed the shuffle.
-      questions = selectRandomQuestionsFromResources(1, selectedIds, true);
+      questions = selectRandomQuestionsFromResources(1, get(activeResourcePool), selectedIds);
       question_count = 1;
     }
     updateSection({

From e80c04beacf9fc0bb9558f239a8edc3c72fb0ce0 Mon Sep 17 00:00:00 2001
From: Jacob Pierce <w.jacobpierce@gmail.com>
Date: Tue, 9 Apr 2024 14:49:08 -0700
Subject: [PATCH 63/67] better definition for QuizQuestion.id in specs

---
 .../plugins/coach/assets/src/composables/quizCreationSpecs.js  | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/kolibri/plugins/coach/assets/src/composables/quizCreationSpecs.js b/kolibri/plugins/coach/assets/src/composables/quizCreationSpecs.js
index 6d81c1ad8c8..95b2b3e1976 100644
--- a/kolibri/plugins/coach/assets/src/composables/quizCreationSpecs.js
+++ b/kolibri/plugins/coach/assets/src/composables/quizCreationSpecs.js
@@ -55,7 +55,8 @@ export const QuizExercise = {
 /**
  * @typedef  {Object} QuizQuestion         A particular question in a Quiz - aka an assessment item
  *                                         from an QuizExercise.
- * @property {string} id                   A  ** unique **  identifier for this question
+ * @property {string} id                   A  ** unique **  identifier for this question that is
+ *                                          a combination of <exercise_id>:<question_id>
  * @property {string} exercise_id          The ID of the resource from which the question originates
  * @property {string} question_id          A *unique* identifier of this particular question within
  *                                         the quiz -- same as the `assessment_item_id`

From f70e25c058fbd57282fd141c34a9f92fab64b910 Mon Sep 17 00:00:00 2001
From: Jacob Pierce <w.jacobpierce@gmail.com>
Date: Tue, 9 Apr 2024 16:15:56 -0700
Subject: [PATCH 64/67] update useQuizCreation spec data to accommodate unique
 IDs

---
 kolibri/plugins/coach/assets/test/useQuizCreation.spec.js | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/kolibri/plugins/coach/assets/test/useQuizCreation.spec.js b/kolibri/plugins/coach/assets/test/useQuizCreation.spec.js
index d30308dbd09..c21ffd26f35 100644
--- a/kolibri/plugins/coach/assets/test/useQuizCreation.spec.js
+++ b/kolibri/plugins/coach/assets/test/useQuizCreation.spec.js
@@ -53,7 +53,12 @@ function generateExercise(numQuestions) {
   const assessments = generateQuestions(numQuestions);
   const assessmentmetadata = { assessment_item_ids: assessments.map(q => q.question_id) };
   const exercise = objectWithDefaults(
-    { content_id: 'exercise_1', assessmentmetadata },
+    {
+      id: 'exercise_1',
+      content_id: 'exercise_1',
+      assessmentmetadata,
+      unique_question_ids: assessments.map(q => `exercise_1:${q.question_id}`),
+    },
     QuizExercise
   );
   return exercise;

From 84a37a3f9a5642471eb3e8094fe6fb15771a9145 Mon Sep 17 00:00:00 2001
From: Jacob Pierce <w.jacobpierce@gmail.com>
Date: Fri, 12 Apr 2024 13:35:24 -0700
Subject: [PATCH 65/67] update og to original

---
 .../assets/src/composables/useQuizCreation.js | 54 +++++++++++--------
 1 file changed, 31 insertions(+), 23 deletions(-)

diff --git a/kolibri/plugins/coach/assets/src/composables/useQuizCreation.js b/kolibri/plugins/coach/assets/src/composables/useQuizCreation.js
index 5cd8fc0a185..5b66c01049a 100644
--- a/kolibri/plugins/coach/assets/src/composables/useQuizCreation.js
+++ b/kolibri/plugins/coach/assets/src/composables/useQuizCreation.js
@@ -67,11 +67,11 @@ export default function useQuizCreation() {
       throw new TypeError(`Section with id ${section_id} not found; cannot be updated.`);
     }
 
-    // og* variables are the original values of the properties we're updating
+    // original variables are the original values of the properties we're updating
     const {
-      resource_pool: ogResourcePool,
-      questions: ogQuestions,
-      question_count: ogQuestionCount,
+      resource_pool: originalResourcePool,
+      questions: originalQuestions,
+      question_count: originalQuestionCount,
     } = targetSection;
 
     const { resource_pool, question_count } = updates;
@@ -82,42 +82,50 @@ export default function useQuizCreation() {
     }
     if (resource_pool?.length > 0) {
       // The resource_pool is being updated
-      if (ogResourcePool.length === 0) {
+      if (originalResourcePool.length === 0) {
         // We're adding resources to a section which didn't previously have any
 
+        // TODO This code could be broken out into a separate functions
+
         // ***
         // Note that we're basically assuming that `questions*` properties aren't being updated --
         // meaning we expect that we can only update one or the other of `resource_pool` and
         // `questions*` at a time. We can safely assume this because there can't be questions
-        // if there weren't resources in the ogResourcePool before.
+        // if there weren't resources in the originalResourcePool before.
         // ***
         updates.questions = selectRandomQuestionsFromResources(
-          question_count || ogQuestionCount,
+          question_count || originalQuestionCount,
           resource_pool
         );
       } else {
         // In this case, we already had resources in the section, so we need to handle the
         // case where a resource has been removed so that we remove & replace the questions
-        const removedResourceQuestionIds = ogResourcePool.reduce((questionIds, ogResource) => {
-          if (!resource_pool.map(r => r.id).includes(ogResource.id)) {
-            // If the resource_pool doesn't have the ogResource, we're removing it
-            questionIds = [...questionIds, ...ogResource.unique_question_ids];
+        const removedResourceQuestionIds = originalResourcePool.reduce(
+          (questionIds, originalResource) => {
+            if (!resource_pool.map(r => r.id).includes(originalResource.id)) {
+              // If the resource_pool doesn't have the originalResource, we're removing it
+              questionIds = [...questionIds, ...originalResource.unique_question_ids];
+              return questionIds;
+            }
             return questionIds;
-          }
-          return questionIds;
-        }, []);
+          },
+          []
+        );
         if (removedResourceQuestionIds.length === 0) {
           // If no resources were removed, we don't need to update the questions
           return;
         }
-        const questionsToKeep = ogQuestions.filter(q => !removedResourceQuestionIds.includes(q.id));
-        const numReplacementsNeeded = (question_count || ogQuestionCount) - questionsToKeep.length;
+        const questionsToKeep = originalQuestions.filter(
+          q => !removedResourceQuestionIds.includes(q.id)
+        );
+        const numReplacementsNeeded =
+          (question_count || originalQuestionCount) - questionsToKeep.length;
         updates.questions = [
           ...questionsToKeep,
           ...selectRandomQuestionsFromResources(numReplacementsNeeded, resource_pool),
         ];
       }
-    } else if (question_count !== ogQuestionCount) {
+    } else if (question_count !== originalQuestionCount) {
       /**
        * Handle edge cases re: questions and question_count changing. When the question_count
        * changes, we remove/add questions to match the new count. If questions are deleted, then
@@ -126,18 +134,18 @@ export default function useQuizCreation() {
 
       // If the question count changed AND questions have changed, be sure they're the same length
       // or we can add questions to match the new question_count
-      if (question_count < ogQuestionCount) {
+      if (question_count < originalQuestionCount) {
         // If the question_count is being reduced, we need to remove any questions that are now
         // outside the bounds of the new question_count
-        updates.questions = ogQuestions.slice(0, question_count);
-      } else if (question_count > ogQuestionCount) {
+        updates.questions = originalQuestions.slice(0, question_count);
+      } else if (question_count > originalQuestionCount) {
         // If the question_count is being increased, we need to add new questions to the end of the
         // questions array
-        const numQuestionsToAdd = question_count - ogQuestionCount;
+        const numQuestionsToAdd = question_count - originalQuestionCount;
         const newQuestions = selectRandomQuestionsFromResources(
           numQuestionsToAdd,
-          ogResourcePool,
-          ogQuestions.map(q => q.id) // Exclude questions we already have to avoid duplicates
+          originalResourcePool,
+          originalQuestions.map(q => q.id) // Exclude questions we already have to avoid duplicates
         );
         updates.questions = [...targetSection.questions, ...newQuestions];
       }

From dbc342b3e9a354fa471955a4db183d25fe00ec5d Mon Sep 17 00:00:00 2001
From: Jacob Pierce <w.jacobpierce@gmail.com>
Date: Fri, 12 Apr 2024 14:55:39 -0700
Subject: [PATCH 66/67] fix replacement contentrenderer id refs

---
 .../assets/src/views/plan/CreateExamPage/ReplaceQuestions.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/kolibri/plugins/coach/assets/src/views/plan/CreateExamPage/ReplaceQuestions.vue b/kolibri/plugins/coach/assets/src/views/plan/CreateExamPage/ReplaceQuestions.vue
index 96c33da6b85..fc1eef505fc 100644
--- a/kolibri/plugins/coach/assets/src/views/plan/CreateExamPage/ReplaceQuestions.vue
+++ b/kolibri/plugins/coach/assets/src/views/plan/CreateExamPage/ReplaceQuestions.vue
@@ -78,12 +78,12 @@
               :style="{ userSelect: dragActive ? 'none!important' : 'text' }"
             >
               <ContentRenderer
-                :ref="`contentRenderer-${question.id}`"
+                :ref="`contentRenderer-${question.question_id}`"
                 :kind="activeResourceMap[question.exercise_id].kind"
                 :lang="activeResourceMap[question.exercise_id].lang"
                 :files="activeResourceMap[question.exercise_id].files"
                 :available="activeResourceMap[question.exercise_id].available"
-                :itemId="question.id"
+                :itemId="question.question_id"
                 :assessment="true"
                 :allowHints="false"
                 :interactive="false"

From 4cf2258318162b07a9d7361a99b1fe772c8a7e91 Mon Sep 17 00:00:00 2001
From: Jacob Pierce <w.jacobpierce@gmail.com>
Date: Thu, 18 Apr 2024 08:54:28 -0700
Subject: [PATCH 67/67] use question.id on ref to ensure uniqueness

---
 .../assets/src/views/plan/CreateExamPage/ReplaceQuestions.vue   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/kolibri/plugins/coach/assets/src/views/plan/CreateExamPage/ReplaceQuestions.vue b/kolibri/plugins/coach/assets/src/views/plan/CreateExamPage/ReplaceQuestions.vue
index fc1eef505fc..f68cb80d6bf 100644
--- a/kolibri/plugins/coach/assets/src/views/plan/CreateExamPage/ReplaceQuestions.vue
+++ b/kolibri/plugins/coach/assets/src/views/plan/CreateExamPage/ReplaceQuestions.vue
@@ -78,7 +78,7 @@
               :style="{ userSelect: dragActive ? 'none!important' : 'text' }"
             >
               <ContentRenderer
-                :ref="`contentRenderer-${question.question_id}`"
+                :ref="`contentRenderer-${question.id}`"
                 :kind="activeResourceMap[question.exercise_id].kind"
                 :lang="activeResourceMap[question.exercise_id].lang"
                 :files="activeResourceMap[question.exercise_id].files"