Remove unfavorite_course_from_dashboard feature flag

Change-Id: I6c2216d6848f9ce44dd76a13ad67cced8ede65d0
Reviewed-on: https://gerrit.instructure.com/c/canvas-lms/+/244585
Tested-by: Service Cloud Jenkins <svc.cloudjenkins@instructure.com>
Reviewed-by: Cody Cutrer <cody@instructure.com>
QA-Review: Cody Cutrer <cody@instructure.com>
Product-Review: Cody Cutrer <cody@instructure.com>
This commit is contained in:
Jacob Burroughs 2020-08-08 14:19:21 -04:00
parent 718457c352
commit 69b866ace2
5 changed files with 4 additions and 30 deletions

View File

@ -149,7 +149,7 @@ module DashboardHelper
end
def map_courses_for_menu(courses, opts={})
Course.preload_menu_data_for(courses, @current_user, preload_favorites: @domain_root_account.feature_enabled?(:unfavorite_course_from_dashboard))
Course.preload_menu_data_for(courses, @current_user, preload_favorites: true)
mapped = courses.map do |course|
presenter = CourseForMenuPresenter.new(course, @current_user, @domain_root_account, session, opts)
presenter.to_h

View File

@ -35,7 +35,6 @@ class CourseForMenuPresenter
def to_h
position = @user.dashboard_positions[course.asset_string]
show_favorites = @user.account.feature_enabled?(:unfavorite_course_from_dashboard)
observee = if course.primary_enrollment_type == 'ObserverEnrollment'
ObserverEnrollment.observed_students(course, @user)&.keys&.map(&:name).join(', ')
@ -53,7 +52,7 @@ class CourseForMenuPresenter
enrollmentType: course.primary_enrollment_type,
observee: observee,
id: course.id,
isFavorited: show_favorites && course.favorite_for_user?(@user),
isFavorited: course.favorite_for_user?(@user),
image: course.feature_enabled?(:course_card_images) ? course.image : nil,
position: position.present? ? position.to_i : nil
}.tap do |hash|

View File

@ -419,13 +419,6 @@ new_gradebook_plagiarism_indicator:
display_name: New Gradebook Plagiarism Indicator
description: Enables display of plagiarism reports and similarity scores in
the New Gradebook submission tray.
unfavorite_course_from_dashboard:
state: hidden
applies_to: RootAccount
display_name: Course Favorites From Dashboard
description: This allows the user to unfavorite a course directly from its
dashboard card.
root_opt_in: true
commons_favorites:
state: hidden
applies_to: RootAccount

View File

@ -2306,7 +2306,6 @@ describe UsersController do
end
it "should load favorites" do
Account.default.enable_feature!(:unfavorite_course_from_dashboard)
@user.favorites.where(:context_type => 'Course', :context_id => @course1).first_or_create!
get 'user_dashboard'
course_data = assigns[:js_env][:STUDENT_PLANNER_COURSES]

View File

@ -72,8 +72,7 @@ describe CourseForMenuPresenter do
expect(h[:shortName]).to eq 'nickname'
end
it 'sets isFavorited to true if course is favorited and unfavorite_course_from_dashboard flag enabled' do
user.account.enable_feature!(:unfavorite_course_from_dashboard)
it 'sets isFavorited to true if course is favorited' do
course.enroll_student(user)
Favorite.create!(user: user, context: course)
cs_presenter = CourseForMenuPresenter.new(course, user, account)
@ -81,23 +80,7 @@ describe CourseForMenuPresenter do
expect(h[:isFavorited]).to eq true
end
it 'sets isFavorited to false if course is favorited and unfavorite_course_from-dashboard flag disabled' do
course.enroll_student(user)
Favorite.create!(user: user, context: course)
cs_presenter = CourseForMenuPresenter.new(course, user, account)
h = cs_presenter.to_h
expect(h[:isFavorited]).to eq false
end
it 'sets isFavorited to false if course is unfavorited and unfavorite_course_from_dashboard flag enabled' do
user.account.enable_feature!(:unfavorite_course_from_dashboard)
course.enroll_student(user)
cs_presenter = CourseForMenuPresenter.new(course, user, account)
h = cs_presenter.to_h
expect(h[:isFavorited]).to eq false
end
it 'sets isFavorited to false if course is unfavorited and unfavorite_course_from_dashboard flag disabled' do
it 'sets isFavorited to false if course is unfavorited' do
course.enroll_student(user)
cs_presenter = CourseForMenuPresenter.new(course, user, account)
h = cs_presenter.to_h