From 69b866ace23851767bc25bcdffa9525275fce48d Mon Sep 17 00:00:00 2001 From: Jacob Burroughs Date: Sat, 8 Aug 2020 14:19:21 -0400 Subject: [PATCH] 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 Reviewed-by: Cody Cutrer QA-Review: Cody Cutrer Product-Review: Cody Cutrer --- app/helpers/dashboard_helper.rb | 2 +- app/presenters/course_for_menu_presenter.rb | 3 +-- config/feature_flags/00_standard.yml | 7 ------- spec/controllers/users_controller_spec.rb | 1 - .../course_for_menu_presenter_spec.rb | 21 ++----------------- 5 files changed, 4 insertions(+), 30 deletions(-) diff --git a/app/helpers/dashboard_helper.rb b/app/helpers/dashboard_helper.rb index 979f9496ce6..93ecff28934 100644 --- a/app/helpers/dashboard_helper.rb +++ b/app/helpers/dashboard_helper.rb @@ -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 diff --git a/app/presenters/course_for_menu_presenter.rb b/app/presenters/course_for_menu_presenter.rb index 9ba5a1be287..7e82d9c3d61 100644 --- a/app/presenters/course_for_menu_presenter.rb +++ b/app/presenters/course_for_menu_presenter.rb @@ -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| diff --git a/config/feature_flags/00_standard.yml b/config/feature_flags/00_standard.yml index 9a7ef7846d3..e6e8e5e001d 100644 --- a/config/feature_flags/00_standard.yml +++ b/config/feature_flags/00_standard.yml @@ -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 diff --git a/spec/controllers/users_controller_spec.rb b/spec/controllers/users_controller_spec.rb index c87e90915a9..4aa5c343ae6 100644 --- a/spec/controllers/users_controller_spec.rb +++ b/spec/controllers/users_controller_spec.rb @@ -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] diff --git a/spec/presenters/course_for_menu_presenter_spec.rb b/spec/presenters/course_for_menu_presenter_spec.rb index 4291755715e..d20088ed23e 100644 --- a/spec/presenters/course_for_menu_presenter_spec.rb +++ b/spec/presenters/course_for_menu_presenter_spec.rb @@ -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