Remove bookmarking_for_enrollments_index feature flag
Remove bookmarking_for_enrollments_index feature flag entirely. fixes LS-1976 flag=none Test plan: 1. Check the flag is not present and is removed Change-Id: I5e47cea4b810344bf36d97700881d85f3ac620fc Reviewed-on: https://gerrit.instructure.com/c/canvas-lms/+/265948 Tested-by: Service Cloud Jenkins <svc.cloudjenkins@instructure.com> Reviewed-by: Nate Armstrong <narmstrong@instructure.com> QA-Review: Nate Armstrong <narmstrong@instructure.com> Product-Review: Nate Armstrong <narmstrong@instructure.com>
This commit is contained in:
parent
de6eca5923
commit
55ce3302ec
|
@ -428,7 +428,7 @@ class EnrollmentsApiController < ApplicationController
|
|||
# a few specific developer keys temporarily need bookmarking disabled, see INTEROP-5326
|
||||
pagination_override_key_list = Setting.get("pagination_override_key_list", "").split(',').map(&:to_i)
|
||||
use_numeric_pagination_override = pagination_override_key_list.include?(@access_token&.global_developer_key_id)
|
||||
use_bookmarking = @domain_root_account&.feature_enabled?(:bookmarking_for_enrollments_index) && !use_numeric_pagination_override
|
||||
use_bookmarking = !use_numeric_pagination_override
|
||||
enrollments = use_bookmarking ?
|
||||
enrollments.joins(:user).select("enrollments.*, users.sortable_name AS sortable_name") :
|
||||
enrollments.joins(:user).select("enrollments.*").
|
||||
|
|
|
@ -15,11 +15,6 @@ assignments_2_teacher:
|
|||
environments:
|
||||
production:
|
||||
state: disabled
|
||||
bookmarking_for_enrollments_index:
|
||||
state: allowed
|
||||
applies_to: RootAccount
|
||||
display_name: Bookmarking for Enrollments Index API
|
||||
description: Use bookmarking for API pagination in Enrollments Index
|
||||
new_math_equation_handling:
|
||||
state: hidden
|
||||
display_name: 'Math: Updated equation handling'
|
||||
|
|
|
@ -813,7 +813,6 @@ describe EnrollmentsApiController, type: :request do
|
|||
end
|
||||
|
||||
it "should deterministically order enrollments for pagination" do
|
||||
Account.default.enable_feature!(:bookmarking_for_enrollments_index)
|
||||
enrollment_num = 10
|
||||
enrollment_num.times do
|
||||
u = user_with_pseudonym(name: "John Smith", sortable_name: "Smith, John")
|
||||
|
@ -2271,6 +2270,7 @@ describe EnrollmentsApiController, type: :request do
|
|||
) if e.user == @user
|
||||
h
|
||||
end
|
||||
|
||||
link_header = response.headers['Link'].split(',')
|
||||
expect(link_header[0]).to match /page=1&per_page=1/ # current page
|
||||
expect(link_header[1]).to match /page=2&per_page=1/ # next page
|
||||
|
@ -2351,21 +2351,6 @@ describe EnrollmentsApiController, type: :request do
|
|||
end
|
||||
|
||||
context 'with normal settings' do
|
||||
it_behaves_like 'numeric pagination'
|
||||
|
||||
context 'with developer key pagination override' do
|
||||
before do
|
||||
global_id = Shard.global_id_for(DeveloperKey.default.id)
|
||||
Setting.set("pagination_override_key_list", global_id.to_s)
|
||||
end
|
||||
|
||||
it_behaves_like 'numeric pagination'
|
||||
end
|
||||
end
|
||||
|
||||
context 'with bookmark flag enabled' do
|
||||
before { Account.default.enable_feature!(:bookmarking_for_enrollments_index) }
|
||||
|
||||
it_behaves_like 'bookmarked pagination'
|
||||
|
||||
context 'with developer key pagination override' do
|
||||
|
|
Loading…
Reference in New Issue