Skip to content

fix: append course name with code to avoid ambiguity in inbox drop down #2577

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

Open
duidae wants to merge 1 commit into
base: master
Choose a base branch
from
+11 −4
Open

fix: append course name with code to avoid ambiguity in inbox drop down #2577

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 4 additions & 0 deletions ui/features/inbox/graphql/Course.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ export const Course = {
fragment Course on Course {
_id
courseNickname
courseCode
contextName: name
assetString
}
Expand All @@ -32,18 +33,21 @@ export const Course = {
shape: shape({
_id: string,
courseNickname: string,
courseCode: string,
contextName: string,
assetString: string,
}),

mock: ({
_id = '195',
courseNickname = 'Ipsum',
courseCode = 'CS101',
contextName = 'XavierSchool',
assetString = 'course_195',
} = {}) => ({
_id,
courseNickname,
courseCode,
contextName,
assetString,
__typename: 'Course',
Expand Down
11 changes: 7 additions & 4 deletions ui/features/inbox/react/components/CourseSelect/CourseSelect.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,10 @@ const I18n = createI18nScope('conversations_2')

export const ALL_COURSES_ID = 'all_courses'

const appendCourseNameWithCode = (courseName, courseCode) => {
return `${courseName ?? ''}${courseCode ? `(${courseCode})` : ''}`
}

const filterOptions = (value, options) => {
const filteredOptions = {}
Object.keys(options).forEach(key => {
Expand All @@ -37,8 +41,7 @@ const filterOptions = (value, options) => {
} else {
filteredOptions[key] = options[key]?.filter(
option =>
option.contextName.toLowerCase().includes(value.toLowerCase()) ||
option.courseNickname?.toLowerCase().includes(value.toLowerCase()),
appendCourseNameWithCode(option.contextName || option.courseNickname, option.courseCode).toLowerCase().includes(value.toLowerCase())
)
}
})
Expand All @@ -54,7 +57,7 @@ const getOptionById = (id, options) => {
const getCourseName = (courseAssetString, options) => {
if (courseAssetString) {
const courseInfo = getOptionById(courseAssetString, options)
return courseInfo ? courseInfo.contextName : ''
return courseInfo ? appendCourseNameWithCode(courseInfo.contextName, courseInfo.courseCode) : ''
} else {
return ''
}
Expand Down Expand Up @@ -215,7 +218,7 @@ const CourseSelect = props => {
isHighlighted={option.assetString === highlightedOptionId}
isSelected={option.assetString === selectedOptionId}
>
{option.courseNickname || option.contextName}
{appendCourseNameWithCode(option.courseNickname || option.contextName, option.courseCode)}
<ScreenReaderContent>
{I18n.t(` in %{listHeading}`, {listHeading: getGroupLabel(key)})}
</ScreenReaderContent>
Expand Down