08c3e59aee
On our dev instance, /admin/applications as not loading because: 1. There was an unindexed query by `application_id`. 2. There was an expensive query that attempted to load 1 million unique entries via ActiveRecord just to find the unique count. We fix the first issue by adding an index for that column. We fix the second issue with a simple SELECT COUNT(DISTINCT resource_owner_id) SQL query. In addition, we add pagination to avoid loading more than 20 applications at once. Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/67228
60 lines
1.6 KiB
Ruby
60 lines
1.6 KiB
Ruby
# frozen_string_literal: true
|
|
|
|
class Admin::ApplicationsController < Admin::ApplicationController
|
|
include OauthApplications
|
|
|
|
before_action :set_application, only: [:show, :edit, :update, :destroy]
|
|
before_action :load_scopes, only: [:new, :create, :edit, :update]
|
|
|
|
def index
|
|
applications = ApplicationsFinder.new.execute
|
|
@applications = Kaminari.paginate_array(applications).page(params[:page])
|
|
@application_counts = OauthAccessToken.distinct_resource_owner_counts(@applications)
|
|
end
|
|
|
|
def show
|
|
end
|
|
|
|
def new
|
|
@application = Doorkeeper::Application.new
|
|
end
|
|
|
|
def edit
|
|
end
|
|
|
|
def create
|
|
@application = Applications::CreateService.new(current_user, application_params).execute(request)
|
|
|
|
if @application.persisted?
|
|
flash[:notice] = I18n.t(:notice, scope: [:doorkeeper, :flash, :applications, :create])
|
|
|
|
redirect_to admin_application_url(@application)
|
|
else
|
|
render :new
|
|
end
|
|
end
|
|
|
|
def update
|
|
if @application.update(application_params)
|
|
redirect_to admin_application_path(@application), notice: _('Application was successfully updated.')
|
|
else
|
|
render :edit
|
|
end
|
|
end
|
|
|
|
def destroy
|
|
@application.destroy
|
|
redirect_to admin_applications_url, status: 302, notice: _('Application was successfully destroyed.')
|
|
end
|
|
|
|
private
|
|
|
|
def set_application
|
|
@application = ApplicationsFinder.new(id: params[:id]).execute
|
|
end
|
|
|
|
# Only allow a trusted parameter "white list" through.
|
|
def application_params
|
|
params.require(:doorkeeper_application).permit(:name, :redirect_uri, :trusted, :scopes)
|
|
end
|
|
end
|