From 06fc1fad1d808fd1117e5be51536d57045e03d37 Mon Sep 17 00:00:00 2001 From: duidae Date: Fri, 13 Mar 2026 10:38:58 +0800 Subject: [PATCH 1/3] fix: fix conflict --- .../containers/MessageListActionContainer.tsx | 21 ++++++++++--------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/ui/features/inbox/react/containers/MessageListActionContainer.tsx b/ui/features/inbox/react/containers/MessageListActionContainer.tsx index 68dc7a4f6d20e..36ac0043b10b1 100644 --- a/ui/features/inbox/react/containers/MessageListActionContainer.tsx +++ b/ui/features/inbox/react/containers/MessageListActionContainer.tsx @@ -68,16 +68,17 @@ const MessageListActionContainer = props => { data?.legacyNode?.favoriteCoursesConnection?.nodes, ) - // @ts-expect-error TS7034 (typescriptify) - const moreCourses = [] - const concludedCourses = uniqueCourses.filter(course => { - if (course.concluded !== true) { - moreCourses.push(course) - return false - } else { - return true - } - }) + const { concludedCourses, moreCourses } = uniqueCourses.reduce( + (acc, course) => { + if (course.concluded === true) { + acc.concludedCourses.push(course) + } else { + acc.moreCourses.push(course) + } + return acc + }, + { concludedCourses: [], moreCourses: [] } + ) const courseSelectorOptions = { allCourses: [ From bb455e020e1db39304f368f1d9297c452240fe35 Mon Sep 17 00:00:00 2001 From: duidae Date: Thu, 29 Jan 2026 14:01:25 +0800 Subject: [PATCH 2/3] fix: replace constants with defined variable --- .../inbox/react/components/CourseSelect/CourseSelect.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ui/features/inbox/react/components/CourseSelect/CourseSelect.tsx b/ui/features/inbox/react/components/CourseSelect/CourseSelect.tsx index c481f3aaceab3..5067607bc66a9 100644 --- a/ui/features/inbox/react/components/CourseSelect/CourseSelect.tsx +++ b/ui/features/inbox/react/components/CourseSelect/CourseSelect.tsx @@ -160,7 +160,7 @@ const CourseSelect = props => { // @ts-expect-error TS2339 (typescriptify) const contextName = option.contextName - const actualId = id === 'all_courses' ? null : id + const actualId = id === ALL_COURSES_ID ? null : id props.onCourseFilterSelect({contextID: actualId, contextName}) setSelectedOptionId(actualId) From 28ea30fb33ed88ad565531fdaa695e4c25e298ab Mon Sep 17 00:00:00 2001 From: duidae Date: Thu, 29 Jan 2026 14:07:34 +0800 Subject: [PATCH 3/3] fix: replace constants with defined variable --- .../inbox/react/components/CourseSelect/CourseSelect.tsx | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/ui/features/inbox/react/components/CourseSelect/CourseSelect.tsx b/ui/features/inbox/react/components/CourseSelect/CourseSelect.tsx index 5067607bc66a9..0bd4be261da83 100644 --- a/ui/features/inbox/react/components/CourseSelect/CourseSelect.tsx +++ b/ui/features/inbox/react/components/CourseSelect/CourseSelect.tsx @@ -27,13 +27,14 @@ import {CloseButton} from '@instructure/ui-buttons' const I18n = createI18nScope('conversations_2') export const ALL_COURSES_ID = 'all_courses' +const ALL_COURSES_KEY = 'allCourses' // @ts-expect-error TS7006 (typescriptify) const filterOptions = (value, options) => { const filteredOptions = {} Object.keys(options).forEach(key => { - if (key === 'allCourses') { - // if provided, allCourses should always be present + if (key === ALL_COURSES_KEY) { + // if provided, ALL_COURSES_KEY should always be present // @ts-expect-error TS7053 (typescriptify) filteredOptions[key] = options[key] } else { @@ -218,7 +219,7 @@ const CourseSelect = props => { return I18n.t('Concluded Courses') case 'groups': return I18n.t('Groups') - case 'allCourses': + case ALL_COURSES_KEY: return I18n.t('Courses') } }