eb524790-4379-4a6f-abba-4e935791e977

Committed 17 Apr 2026 01:12PM UTC coverage: 93.271% (-4.2%) from 97.448%

Build # eb524790-4379-4a6f-abba-4e935791e977

Build Type

push

circleci

Committed by

web-flow

Commit Message

Merge pull request #2496 from curationexperts/deactivate_depts

Allow school and department approvers to edit InProgressEtds

Coverage Stats

3 of 10 new or added lines in 3 files covered. (30.0%)

162 existing lines in 19 files now uncovered.

2703 of 2898 relevant lines covered (93.27%)

36.03 hits per line

Source File
Press 'n' to go to next uncovered line, 'b' for previous

88.37

/app/controllers/in_progress_etds_controller.rb

class InProgressEtdsController < ApplicationController
  def new
    authorize! :create, InProgressEtd

    @in_progress_etd = if params[:etd_id]
                         InProgressEtd.find_or_create_by(etd_id: params[:etd_id])
                       else
                         InProgressEtd.find_or_create_by(user_ppid: current_user.ppid)
                       end

    # Now that the record has been created, render the form so student can edit it:
    redirect_to action: :edit, id: @in_progress_etd.id
  end

  # Note: There is no 'create' action because the 'new' action does 'find or create'.

  def edit
    if current_user.nil?
      redirect_to new_user_session_path
    else
      @in_progress_etd = InProgressEtd.find(params[:id])
      authorize! :update, @in_progress_etd
      @in_progress_etd.refresh_from_etd!
      @data = @in_progress_etd.data
      @form_level = form_level
    end
  rescue ActiveRecord::RecordNotFound
    redirect_to root_url
  end

  # The Vue.js form uses this action to update the record.
  def update
    @in_progress_etd = InProgressEtd.find(params[:id])
    authorize! :update, @in_progress_etd
    @in_progress_etd.data = prepare_etd_data.to_json

    if @in_progress_etd.save
      @data = @in_progress_etd.data
      render json: { in_progress_etd: @data, lastCompletedStep: current_step(@data), tab_name: tab_name }, status: 200
    else
      render json: { errors: @in_progress_etd.errors.messages }, status: 422
    end
  end

  def destroy
    @in_progress_etd = InProgressEtd.find(params[:id])
    authorize! :update, @in_progress_etd
    @in_progress_etd.destroy

    redirect_to root_url
  end

  private

    def current_step(data)
      saved_data = JSON.parse(data)
      saved_data['currentStep']
    end

    def tab_name
      etd = request.parameters.fetch(:etd)
      etd.fetch(:currentTab, "About Me")
    end

    def prepare_etd_data
      # TODO: strong params
      new_data = request.parameters.fetch(:etd, {})

      # Add the new data to the existing persisted data
      @in_progress_etd.add_data(new_data)
    end

    # Show :basic form for regular users - e.g. active field values only
    # Or :advanced form for super_admins - e.g. also show inactive fields values
    def form_level
      return :advanced if current_user.admin?
      return :advanced if current_ability.can_review_submissions?
      :basic
    end
end

1	class InProgressEtdsController < ApplicationController	3✔
2	def new	3✔
3	authorize! :create, InProgressEtd	6✔
4
5	@in_progress_etd = if params[:etd_id]	6✔
6	InProgressEtd.find_or_create_by(etd_id: params[:etd_id])	4✔
7	else
UNCOV 8	InProgressEtd.find_or_create_by(user_ppid: current_user.ppid)	2✔
9	end
10
11	# Now that the record has been created, render the form so student can edit it:
12	redirect_to action: :edit, id: @in_progress_etd.id	6✔
13	end
14
15	# Note: There is no 'create' action because the 'new' action does 'find or create'.
16
17	def edit	3✔
18	if current_user.nil?	9✔
19	redirect_to new_user_session_path	1✔
20	else
21	@in_progress_etd = InProgressEtd.find(params[:id])	8✔
22	authorize! :update, @in_progress_etd	7✔
23	@in_progress_etd.refresh_from_etd!	6✔
24	@data = @in_progress_etd.data	6✔
25	@form_level = form_level	6✔
26	end
27	rescue ActiveRecord::RecordNotFound
28	redirect_to root_url	1✔
29	end
30
31	# The Vue.js form uses this action to update the record.
32	def update	3✔
UNCOV 33	@in_progress_etd = InProgressEtd.find(params[:id])	7✔
UNCOV 34	authorize! :update, @in_progress_etd	7✔
UNCOV 35	@in_progress_etd.data = prepare_etd_data.to_json	7✔
36
UNCOV 37	if @in_progress_etd.save	7✔
UNCOV 38	@data = @in_progress_etd.data	7✔
UNCOV 39	render json: { in_progress_etd: @data, lastCompletedStep: current_step(@data), tab_name: tab_name }, status: 200	7✔
40	else
41	render json: { errors: @in_progress_etd.errors.messages }, status: 422	×
42	end
43	end
44
45	def destroy	3✔
46	@in_progress_etd = InProgressEtd.find(params[:id])	×
47	authorize! :update, @in_progress_etd	×
48	@in_progress_etd.destroy	×
49
50	redirect_to root_url	×
51	end
52
53	private	3✔
54
55	def current_step(data)	3✔
UNCOV 56	saved_data = JSON.parse(data)	7✔
UNCOV 57	saved_data['currentStep']	7✔
58	end
59
60	def tab_name	3✔
UNCOV 61	etd = request.parameters.fetch(:etd)	7✔
UNCOV 62	etd.fetch(:currentTab, "About Me")	7✔
63	end
64
65	def prepare_etd_data	3✔
66	# TODO: strong params
UNCOV 67	new_data = request.parameters.fetch(:etd, {})	7✔
68
69	# Add the new data to the existing persisted data
UNCOV 70	@in_progress_etd.add_data(new_data)	7✔
71	end
72
73	# Show :basic form for regular users - e.g. active field values only
74	# Or :advanced form for super_admins - e.g. also show inactive fields values
75	def form_level	3✔
76	return :advanced if current_user.admin?	6✔
NEW 77	return :advanced if current_ability.can_review_submissions?	2✔
UNCOV 78	:basic	2✔
79	end
80	end

curationexperts / laevigata / eb524790-4379-4a6f-abba-4e935791e977

Source File Press 'n' to go to next uncovered line, 'b' for previous

Source File
Press 'n' to go to next uncovered line, 'b' for previous