Merge pull request #2981 from DMPRoadmap/development

Merging latest development into master

Author: briri

.github/workflows/mysql.yml

@@ -42,7 +42,7 @@ jobs:
 
     # Try to retrieve the gems from the cache
     - name: 'Cache Gems'
-      uses: actions/cache@v1
+      uses: actions/cache@v2.1.5
       with:
         path: vendor/bundle
         key: ${{ runner.os }}-gem-${{ hashFiles('**/Gemfile.lock') }}
@@ -62,7 +62,7 @@ jobs:
 
     # Try to retrieve the yarn JS dependencies from the cache
     - name: 'Cache Yarn Packages'
-      uses: actions/cache@v1
+      uses: actions/cache@v2.1.5
       with:
         path: node_modules/
         key: ${{ runner.os }}-yarn-${{ hashFiles('**/yarn.lock') }}

.github/workflows/postgres.yml

@@ -59,7 +59,7 @@ jobs:
 
     # Try to retrieve the gems from the cache
     - name: 'Cache Gems'
-      uses: actions/cache@v1
+      uses: actions/cache@v2.1.5
       with:
         path: vendor/bundle
         key: ${{ runner.os }}-gem-${{ hashFiles('**/Gemfile.lock') }}
@@ -79,7 +79,7 @@ jobs:
 
     # Try to retrieve the yarn JS dependencies from the cache
     - name: 'Cache Yarn Packages'
-      uses: actions/cache@v1
+      uses: actions/cache@v2.1.5
       with:
         path: node_modules/
         key: ${{ runner.os }}-yarn-${{ hashFiles('**/yarn.lock') }}

app/assets/images/spinner.gif

@@ -0,0 +1,10 @@
+.spinner-border {
+  position: fixed;
+  top: 48%;
+  left: 43%;
+}
+
+.spinner-border img {
+  height: 80px;
+  width: 80px;
+}

app/assets/stylesheets/blocks/_spinner.scss

@@ -67,7 +67,9 @@ def index
       params[:per_page] = max_pages if params[:per_page].to_i > max_pages
     end
 
-    @plans = @user.org.plans.includes([{ roles: :user }, { answers: :question_options },
+    # Get all the Org Admin plans
+    org_admin_plans = @user.org.org_admin_plans
+    @plans = org_admin_plans.includes([{ roles: :user }, { answers: :question_options },
                                        template: [{ phases: {
                                          sections: { questions: %i[question_format themes] }
                                        } }, :org]])

app/controllers/api/v0/plans_controller.rb

@@ -37,7 +37,7 @@ module Paginable
   # one approach to just include everything in the double splat `**options` param
 
   # rubocop:disable Metrics/AbcSize, Metrics/MethodLength, Metrics/ParameterLists
-  def paginable_renderise(partial: nil, controller: nil, action: nil,
+  def paginable_renderise(partial: nil, template: nil, controller: nil, action: nil,
                           path_params: {}, query_params: {}, scope: nil,
                           locals: {}, **options)
     unless scope.is_a?(ActiveRecord::Relation)
@@ -50,6 +50,7 @@ def paginable_renderise(partial: nil, controller: nil, action: nil,
     # Default options
     @paginable_options = {}.merge(options)
     @paginable_options[:view_all] = options.fetch(:view_all, true)
+    @paginable_options[:remote] = options.fetch(:remote, true)
     # Assignment for paginable_params based on arguments passed to the method
     @args = paginable_params.to_h
     @args[:controller] = controller if controller
@@ -72,14 +73,17 @@ def paginable_renderise(partial: nil, controller: nil, action: nil,
       locals = locals.merge(
         scope: @refined_scope,
         paginable_params: @args,
-        search_term: @args[:search]
+        search_term: @args[:search],
+        remote: @paginable_options[:remote]
       )
       # If this was an ajax call then render as JSON
       if options[:format] == :json
         render json: { html: render_to_string(layout: "/layouts/paginable",
                                               partial: partial, locals: locals) }
-      else
+      elsif partial.present?
         render(layout: "/layouts/paginable", partial: partial, locals: locals)
+      else
+        render(template: template, locals: locals)
       end
     end
   end
@@ -104,7 +108,7 @@ def paginable_sort_link(sort_field)
       sort_link_name(sort_field),
       sort_link_url(sort_field),
       class: "paginable-action",
-      data: { remote: true },
+      data: { remote: @paginable_options[:remote] },
       aria: { label: sort_field }
     )
   end

app/controllers/concerns/paginable.rb

@@ -15,7 +15,7 @@ def index
 
     @super_admin = current_user.can_super_admin?
     @clicked_through = params[:click_through].present?
-    @plans = @super_admin ? Plan.all.page(1) : current_user.org.plans.page(1)
+    @plans = @super_admin ? Plan.all.page(1) : current_user.org.org_admin_plans.page(1)
   end
 
   # GET org_admin/plans/:id/feedback_complete
@@ -61,7 +61,7 @@ def download_plans
 
     plans = CSV.generate do |csv|
       csv << header_cols
-      org.plans.includes(template: :org).order(updated_at: :desc).each do |plan|
+      org.org_admin_plans.includes(template: :org).order(updated_at: :desc).each do |plan|
         csv << [
           plan.title.to_s,
           plan.template.title.to_s,

app/controllers/org_admin/plans_controller.rb

@@ -34,12 +34,10 @@ def organisationally_or_publicly_visible
 
   # GET /paginable/plans/publicly_visible/:page
   def publicly_visible
-    paginable_renderise(
-      partial: "publicly_visible",
-      scope: Plan.publicly_visible.includes(:template),
-      query_params: { sort_field: "plans.updated_at", sort_direction: :desc },
-      format: :json
-    )
+    # We want the pagination/sort/search to be retained in the URL so redirect instead
+    # of processing this as a JSON
+    paginable_params = params.permit(:page, :search, :sort_field, :sort_direction)
+    redirect_to public_plans_path(paginable_params.to_h)
   end
 
   # GET /paginable/plans/org_admin/:page
@@ -49,7 +47,7 @@ def org_admin
     # check if current user if super_admin
     @super_admin = current_user.can_super_admin?
     @clicked_through = params[:click_through].present?
-    plans = @super_admin ? Plan.all : current_user.org.plans
+    plans = @super_admin ? Plan.all : current_user.org.org_admin_plans
     plans = plans.joins(:template, roles: [user: :org]).where(Role.creator_condition)
 
     paginable_renderise(

app/controllers/paginable/plans_controller.rb

@@ -85,18 +85,10 @@ def customisable
   # GET /paginable/templates/publicly_visible/:page  (AJAX)
   # -----------------------------------------------------
   def publicly_visible
-    templates = Template.live(Template.families(Org.funder.pluck(:id)).pluck(:family_id))
-                        .publicly_visible.pluck(:id) <<
-                Template.where(is_default: true).unarchived.published.pluck(:id)
-    paginable_renderise(
-      partial: "publicly_visible",
-      scope: Template.joins(:org)
-                     .includes(:org)
-                     .where(id: templates.uniq.flatten)
-                     .published,
-      query_params: { sort_field: "templates.title", sort_direction: :asc },
-      format: :json
-    )
+    # We want the pagination/sort/search to be retained in the URL so redirect instead
+    # of processing this as a JSON
+    paginable_params = params.permit(:page, :search, :sort_field, :sort_direction)
+    redirect_to public_templates_path(paginable_params.to_h)
   end
 
   # GET /paginable/templates/:id/history/:page  (AJAX)

app/controllers/paginable/templates_controller.rb

@@ -124,7 +124,7 @@ def create
         elsif !@plan.template.customization_of.nil?
           # We used a customized version of the the funder template
           # rubocop:disable Layout/LineLength
-          msg += " #{_('This plan is based on the')} #{@plan.funder&.name}: '#{@plan.template.title}' #{_('template with customisations by the')} #{plan_params[:org_name]}"
+          msg += " #{_('This plan is based on the')} #{@plan.funder&.name}: '#{@plan.template.title}' #{_('template with customisations by the')} #{@plan.template.org.name}"
           # rubocop:enable Layout/LineLength
         else
           # We used the specified org's or funder's template
@@ -219,7 +219,16 @@ def show
   #       doing this when we refactor the Plan editing UI
   # GET /plans/:plan_id/phases/:id/edit
   def edit
-    plan = Plan.includes({ template: { phases: { sections: :questions } } }, { answers: :notes })
+    plan = Plan.includes(
+      { template: {
+        phases: {
+          sections: {
+            questions: %i[question_format question_options annotations themes]
+          }
+        }
+      } },
+      { answers: :notes }
+    )
                .find(params[:id])
     authorize plan
     phase_id = params[:phase_id].to_i
@@ -258,7 +267,7 @@ def update
 
       if @plan.update(attrs) # _attributes(attrs)
         format.html do
-          redirect_to plan_contributors_path(@plan),
+          redirect_to plan_path(@plan),
                       notice: success_message(@plan, _("saved"))
         end
         format.json do
@@ -293,7 +302,7 @@ def share
     @plan = Plan.find(params[:id])
     if @plan.present?
       authorize @plan
-      @plan_roles = @plan.roles
+      @plan_roles = @plan.roles.where(active: true)
     else
       redirect_to(plans_path)
     end
@@ -306,7 +315,7 @@ def request_feedback
     @plan = Plan.find(params[:id])
     if @plan.present?
       authorize @plan
-      @plan_roles = @plan.roles
+      @plan_roles = @plan.roles.where(active: true)
     else
       redirect_to(plans_path)
     end