cf64b629-8895-478a-aab7-ed9ddc7c7c7c

Committed 03 May 2026 03:06PM UTC coverage: 94.311% (+1.3%) from 93.055%

Build # cf64b629-8895-478a-aab7-ed9ddc7c7c7c

Build Type

push

circleci

Committed by

web-flow

Commit Message

Merge pull request #2509 from curationexperts/deactivate_depts

Add support for deactivated Subfields

Coverage Stats

2586 of 2742 relevant lines covered (94.31%)

39.18 hits per line

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

95.24

/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

    if @in_progress_etd.save
      @data = @in_progress_etd.data
      render json: { in_progress_etd: @data.to_json, 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)
      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	1✔
2	def new	1✔
3	authorize! :create, InProgressEtd	7✔
4
5	@in_progress_etd = if params[:etd_id]	6✔
6	InProgressEtd.find_or_create_by(etd_id: params[:etd_id])	2✔
7	else
8	InProgressEtd.find_or_create_by(user_ppid: current_user.ppid)	4✔
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	1✔
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	8✔
23	@in_progress_etd.refresh_from_etd!	7✔
24	@data = @in_progress_etd.data	7✔
25	@form_level = form_level	7✔
26	end
27	rescue ActiveRecord::RecordNotFound
28	redirect_to root_url	×
29	end
30
31	# The Vue.js form uses this action to update the record.
32	def update	1✔
33	@in_progress_etd = InProgressEtd.find(params[:id])	13✔
34	authorize! :update, @in_progress_etd	13✔
35	@in_progress_etd.data = prepare_etd_data	11✔
36
37	if @in_progress_etd.save	11✔
38	@data = @in_progress_etd.data	11✔
39	render json: { in_progress_etd: @data.to_json, lastCompletedStep: current_step(@data), tab_name: tab_name }, status: 200	11✔
40	else
41	render json: { errors: @in_progress_etd.errors.messages }, status: 422	×
42	end
43	end
44
45	def destroy	1✔
46	@in_progress_etd = InProgressEtd.find(params[:id])	2✔
47	authorize! :update, @in_progress_etd	2✔
48	@in_progress_etd.destroy	1✔
49
50	redirect_to root_url	1✔
51	end
52
53	private	1✔
54
55	def current_step(data)	1✔
56	data['currentStep']	11✔
57	end
58
59	def tab_name	1✔
60	etd = request.parameters.fetch(:etd)	11✔
61	etd.fetch(:currentTab, "About Me")	11✔
62	end
63
64	def prepare_etd_data	1✔
65	# TODO: strong params
66	new_data = request.parameters.fetch(:etd, {})	11✔
67
68	# Add the new data to the existing persisted data
69	@in_progress_etd.add_data(new_data)	11✔
70	end
71
72	# Show :basic form for regular users - e.g. active field values only
73	# Or :advanced form for super_admins - e.g. also show inactive fields values
74	def form_level	1✔
75	return :advanced if current_user.admin?	7✔
76	return :advanced if current_ability.can_review_submissions?	4✔
77	:basic	3✔
78	end
79	end

curationexperts / laevigata / cf64b629-8895-478a-aab7-ed9ddc7c7c7c

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