Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix: Show search & setting buttons at channel level in quiz resource selection #13198

Merged
merged 3 commits into from
Mar 18, 2025
Merged

Fix: Show search & setting buttons at channel level in quiz resource selection #13198

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
cf9a9d3
move quiz header outside of bookmarks conditional
nucleogenesis Mar 13, 2025
6862282
conditionalize selectFromBookmarks$ in lessons based on bookmarks count
nucleogenesis Mar 13, 2025
d7b47e4
move final bit into header area for search btn in SelectionIndex
nucleogenesis Mar 17, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
62 changes: 35 additions & 27 deletions kolibri/plugins/coach/assets/src/views/common/resourceSelection/subPages/SelectionIndex.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,41 +1,49 @@
<template>

<div>
<div
v-if="bookmarksCount > 0"
<QuizResourceSelectionHeader
v-if="target === SelectionTarget.QUIZ && !settings.selectPracticeQuiz"
class="mb-24"
:settings="settings"
@searchClick="onSearchClick"
/>
<!-- flexDirection is set to row-reverse to align the search button to the right
when we have no bookmarks and thus, no selectFromBookmarks$ string -->
<div
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We will also need to take out these headers to fix it in lessons and for practice quizzes too 👐

https://github.com/nucleogenesis/kolibri/blob/d497f89cec0ebf7776ba4b5d32ebc403885314bd/kolibri/plugins/coach/assets/src/views/common/resourceSelection/subPages/SelectionIndex.vue#L14-L37

And I guess in lessons we should render this string conditionally only if we have bookmarks https://github.com/nucleogenesis/kolibri/blob/d497f89cec0ebf7776ba4b5d32ebc403885314bd/kolibri/plugins/coach/assets/src/views/common/resourceSelection/subPages/SelectionIndex.vue#L19

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@AlexVelezLl just pushed a fix for these two, thanks a ton Alex!

v-if="target === SelectionTarget.LESSON"
class="subheader"
:style="{
flexDirection: bookmarksCount > 0 ? 'row' : 'row-reverse',
}"
>
<div
v-if="target === SelectionTarget.LESSON"
class="subheader"
v-if="bookmarksCount > 0"
class="side-panel-subtitle"
>
<div class="side-panel-subtitle">
{{ selectFromBookmarks$() }}
</div>
<KButton
icon="filter"
:text="searchLabel$()"
@click="onSearchClick"
/>
{{ selectFromBookmarks$() }}
</div>
<KButton
icon="filter"
:text="searchLabel$()"
@click="onSearchClick"
/>
</div>

<QuizResourceSelectionHeader
v-if="target === SelectionTarget.QUIZ && !settings.selectPracticeQuiz"
class="mb-24"
:settings="settings"
@searchClick="onSearchClick"
<div
v-if="target === SelectionTarget.QUIZ && settings.selectPracticeQuiz"
class="d-flex-end mb-24"
>
<KButton
icon="filter"
:text="searchLabel$()"
@click="onSearchClick"
/>
<div
v-if="target === SelectionTarget.QUIZ && settings.selectPracticeQuiz"
class="d-flex-end mb-24"
>
<KButton
icon="filter"
:text="searchLabel$()"
@click="onSearchClick"
/>
</div>
</div>

<div
v-if="bookmarksCount > 0"
class="mb-24"
>
<KCardGrid
layout="1-1-1"
:layoutOverride="gridLayoutOverrides"
Expand Down
Loading