PR for release v3.3.1

.github/workflows/mysql.yml

@@ -54,7 +54,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

@@ -0,0 +1,121 @@
+name: Tests - PostgreSQL
+
+on: [pull_request]
+
+jobs:
+  postgresql:
+    runs-on: ubuntu-latest
+
+    services:
+      # Postgres installation
+      db:
+        image: postgres
+        env:
+          # Latest version of Postgres has increased security. We can use the default
+          # user/password in this testing scenario though so use the following env
+          # variable to bypass this changes:
+          # https://github.com/docker-library/postgres/issues/681
+          POSTGRES_HOST_AUTH_METHOD: trust
+        ports: ['5432:5432']
+        options: >-
+          --health-cmd pg_isready
+          --health-interval 10s
+          --health-timeout 5s
+          --health-retries 5
+
+    env:
+      RAILS_ENV: test
+      DATABASE_URL: postgres://postgres:@localhost:5432/roadmap_test
+
+    steps:
+    # Checkout the repo
+    - uses: actions/checkout@v2
+      with:
+        fetch-depth: 1
+
+    - name: 'Install Postgresql Packages'
+      run: |
+        sudo apt-get update
+        sudo apt-get install libpq-dev
+
+    - name: 'Determine Ruby and Bundler Versions from Gemfile.lock'
+      run: |
+        echo "RUBY_VERSION=`cat ./Gemfile.lock | grep -A 1 'RUBY VERSION' | grep 'ruby' | grep -oE '[0-9]\.[0-9]'`" >> $GITHUB_ENV
+        echo "BUNDLER_VERSION=`cat ./Gemfile.lock | grep -A 1 'BUNDLED WITH' | grep -oE '[0-9]\.[0-9]'`" >> $GITHUB_ENV
+
+    # Install Ruby - using the version found in the Gemfile.lock
+    - name: 'Install Ruby'
+      uses: actions/setup-ruby@v1
+      with:
+        ruby-version: ${{ env.RUBY_VERSION }}
+
+    # Copy all of the example configs over
+    - name: 'Setup Default Configuration'
+      run: |
+        # Make copies of all the example config files
+        cp config/database.yml.sample config/database.yml
+        cp config/initializers/contact_us.rb.example config/initializers/contact_us.rb
+        cp config/initializers/wicked_pdf.rb.example config/initializers/wicked_pdf.rb
+
+    # Try to retrieve the gems from the cache
+    - name: 'Cache Gems'
+      uses: actions/cache@v2.1.5
+      with:
+        path: vendor/bundle
+        key: ${{ runner.os }}-gem-${{ hashFiles('**/Gemfile.lock') }}
+        restore-keys: |
+          ${{ runner.os }}-gem-
+
+    - name: 'Bundle Install'
+      run: |
+        gem install bundler -v ${{ env.BUNDLER_VERSION }}
+        bundle config path vendor/bundle
+        bundle install --jobs 4 --retry 3 --without mysql rollbar aws
+
+    - name: 'Setup Credentials'
+      run: |
+        # generate a default credential file and key
+        EDITOR='echo "$(cat config/credentials.yml.example)" >' bundle exec rails credentials:edit
+
+    # Try to retrieve the yarn JS dependencies from the cache
+    - name: 'Cache Yarn Packages'
+      uses: actions/cache@v2.1.5
+      with:
+        path: node_modules/
+        key: ${{ runner.os }}-yarn-${{ hashFiles('**/yarn.lock') }}
+        restore-keys: |
+          ${{ runner.os }}-build-${{ env.cache-name }}-
+          ${{ runner.os }}-build-
+          ${{ runner.os }}-yarn-
+          ${{ runner.os }}-
+
+    - name: 'Determine wkhtmltopdf location'
+      run: echo "WICKED_PDF_PATH=`bundle exec which wkhtmltopdf`" >> $GITHUB_ENV
+
+    - name: 'Yarn Install'
+      run: |
+        yarn install
+
+    - name: 'Setup Test DB'
+      run: bin/rails db:setup RAILS_ENV=test
+
+    - name: 'Migrate DB'
+      run: bin/rails db:migrate RAILS_ENV=test
+
+    - name: 'Compile Assets'
+      run: |
+        bin/rails webpacker:compile
+        bin/rails assets:precompile
+
+    - name: 'Run Karma Tests'
+      run: yarn test
+
+    - name: 'Run Rspec Unit and Functional Tests'
+      run: |
+        bin/rspec spec/models/ spec/policies/ spec/services/ spec/helpers/
+        bin/rspec spec/controllers/ spec/presenters/ spec/requests/ spec/views
+        bin/rspec spec/mixins/
+
+    # Integration Tests are only run if PR or Push is to master or development branches
+    - name: 'Run Integration Tests'
+      run: bin/rspec spec/features/

Gemfile.lock

@@ -66,17 +66,17 @@ GEM
     api-pagination (4.8.2)
     arel (9.0.0)
     ast (2.4.2)
-    autoprefixer-rails (10.2.5.1)
-      execjs (> 0)
+    autoprefixer-rails (10.3.1.0)
+      execjs (~> 2)
     aws-eventstream (1.1.1)
-    aws-partitions (1.479.0)
-    aws-sdk-core (3.117.0)
+    aws-partitions (1.483.0)
+    aws-sdk-core (3.119.0)
       aws-eventstream (~> 1, >= 1.0.2)
       aws-partitions (~> 1, >= 1.239.0)
       aws-sigv4 (~> 1.1)
       jmespath (~> 1.0)
-    aws-sdk-ssm (1.112.0)
-      aws-sdk-core (~> 3, >= 3.112.0)
+    aws-sdk-ssm (1.114.0)
+      aws-sdk-core (~> 3, >= 3.119.0)
       aws-sigv4 (~> 1.1)
     aws-sigv4 (1.2.4)
       aws-eventstream (~> 1, >= 1.0.2)
@@ -88,9 +88,9 @@ GEM
     bindex (0.8.1)
     binding_of_caller (1.0.0)
       debug_inspector (>= 0.0.1)
-    bootsnap (1.7.5)
+    bootsnap (1.7.7)
       msgpack (~> 1.0)
-    brakeman (5.0.4)
+    brakeman (5.1.1)
     builder (3.2.4)
     bullet (6.1.4)
       activesupport (>= 3.0.0)
@@ -178,14 +178,15 @@ GEM
       railties (>= 5.0.0)
     faker (2.18.0)
       i18n (>= 1.6, < 2)
-    faraday (1.5.1)
+    faraday (1.6.0)
       faraday-em_http (~> 1.0)
       faraday-em_synchrony (~> 1.0)
       faraday-excon (~> 1.1)
       faraday-httpclient (~> 1.0.1)
       faraday-net_http (~> 1.0)
       faraday-net_http_persistent (~> 1.1)
       faraday-patron (~> 1.0)
+      faraday-rack (~> 1.0)
       multipart-post (>= 1.2, < 3)
       ruby2_keywords (>= 0.0.4)
     faraday-em_http (1.0.0)
@@ -195,9 +196,10 @@ GEM
     faraday-net_http (1.0.1)
     faraday-net_http_persistent (1.2.0)
     faraday-patron (1.0.0)
+    faraday-rack (1.0.0)
     ffi (1.15.3)
     flag_shih_tzu (0.3.23)
-    fog-aws (3.10.0)
+    fog-aws (3.11.0)
       fog-core (~> 2.1)
       fog-json (~> 1.1)
       fog-xml (~> 0.1)
@@ -222,8 +224,8 @@ GEM
     gettext (3.3.7)
       locale (>= 2.0.5)
       text (>= 1.3.0)
-    globalid (0.4.2)
-      activesupport (>= 4.2.0)
+    globalid (0.5.2)
+      activesupport (>= 5.0)
     guard (2.18.0)
       formatador (>= 0.2.4)
       listen (>= 2.7, < 4.0)
@@ -272,12 +274,12 @@ GEM
       addressable (~> 2.7)
     ledermann-rails-settings (2.5.0)
       activerecord (>= 4.2)
-    listen (3.5.1)
+    listen (3.6.0)
       rb-fsevent (~> 0.10, >= 0.10.3)
       rb-inotify (~> 0.9, >= 0.9.10)
     locale (2.1.3)
     logger (1.4.3)
-    loofah (2.10.0)
+    loofah (2.11.0)
       crass (~> 1.0.2)
       nokogiri (>= 1.5.9)
     lumberjack (1.2.8)
@@ -292,7 +294,7 @@ GEM
       nokogiri (~> 1)
       rake
     mini_mime (1.1.0)
-    mini_portile2 (2.5.3)
+    mini_portile2 (2.6.1)
     minitest (5.14.4)
     mocha (1.13.0)
     msgpack (1.4.2)
@@ -304,9 +306,9 @@ GEM
     net-scp (3.0.0)
       net-ssh (>= 2.6.5, < 7.0.0)
     net-ssh (6.1.0)
-    nio4r (2.5.7)
-    nokogiri (1.11.7)
-      mini_portile2 (~> 2.5.0)
+    nio4r (2.5.8)
+    nokogiri (1.12.2)
+      mini_portile2 (~> 2.6.1)
       racc (~> 1.4)
     notiffany (0.1.3)
       nenv (~> 0.1)
@@ -344,7 +346,7 @@ GEM
       coderay (~> 1.1)
       method_source (~> 1.0)
     public_suffix (4.0.6)
-    puma (5.3.2)
+    puma (5.4.0)
       nio4r (~> 2.0)
     pundit (2.1.0)
       activesupport (>= 3.0.0)
@@ -422,13 +424,13 @@ GEM
       rspec-mocks (~> 3.10)
       rspec-support (~> 3.10)
     rspec-support (3.10.2)
-    rubocop (1.18.3)
+    rubocop (1.18.4)
       parallel (~> 1.10)
       parser (>= 3.0.0.0)
       rainbow (>= 2.2.2, < 4.0)
       regexp_parser (>= 1.8, < 3.0)
       rexml
-      rubocop-ast (>= 1.7.0, < 2.0)
+      rubocop-ast (>= 1.8.0, < 2.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 1.4.0, < 3.0)
     rubocop-ast (1.8.0)
@@ -529,8 +531,8 @@ GEM
       nokogiri (~> 1.6)
       rubyzip (>= 1.3.0)
       selenium-webdriver (>= 3.0, < 4.0)
-    webmock (3.13.0)
-      addressable (>= 2.3.6)
+    webmock (3.14.0)
+      addressable (>= 2.8.0)
       crack (>= 0.3.2)
       hashdiff (>= 0.4.0, < 2.0.0)
     webpacker (5.4.0)

app/assets/stylesheets/blocks/_modal_search.scss

@@ -66,8 +66,8 @@
   font-size: 1.3rem;
 }
 .modal-search-result .modal-search-result-selector {
-  border: 1px solid $color-green;
-  color: $color-green;
+  background-color: $color-green;
+  color: $color-white;
 }
 .modal-search-result .modal-search-result-unselector {
   border: 1px solid $color-red;

app/assets/stylesheets/blocks/_spinner.scss

@@ -5,6 +5,6 @@
 }
 
 .spinner-border img {
-  width: 80px;
   height: 80px;
+  width: 80px;
 }

app/assets/stylesheets/variables/_colours.scss

@@ -5,7 +5,8 @@
 
 $color-black: #000;
 $color-white: #FFF;
-$color-red: #B30000;
+$color-red: #b94a48;
+$color-green: #4c8d3f;
 $color-grey: #4F5253;
 $color-grey-darkest: #222;
 $color-grey-darker: #333;

app/controllers/api/v0/plans_controller.rb

@@ -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/v1/plans_controller.rb

@@ -12,7 +12,6 @@ class PlansController < BaseApiController
       def show
         plans = Api::V1::PlansPolicy::Scope.new(client, Plan).resolve
                                            .where(id: params[:id]).limit(1)
-
         if plans.present? && plans.any?
           @items = paginate_response(results: plans)
           render "/api/v1/plans/index", status: :ok
@@ -33,6 +32,7 @@ def create
 
         # Convert the JSON into a Plan and it's associations
         plan = Api::V1::Deserialization::Plan.deserialize(json: dmp)
+
         if plan.present?
           save_err = _("Unable to create your DMP")
           exists_err = _("Plan already exists. Send an update instead.")

app/controllers/api/v2/datasets_controller.rb

@@ -31,7 +31,7 @@ def create
         unless errs.any?
           ResearchOutput.transaction do
             datasets.each do |dataset_json|
-              object = Api::V1::Deserialization::Dataset.deserialize(plan: @plan, json: dataset_json)
+              object = Api::V2::Deserialization::Dataset.deserialize(plan: @plan, json: dataset_json)
               # This is a create endpoint so only allow inserts!
               next unless object.new_record?
 

app/controllers/api/v2/plans_controller.rb

@@ -226,7 +226,7 @@ def prep_for_pdf
         @public_plan             = @plan.publicly_visible?
         @formatting =
 
-        @hash           = @plan.as_pdf(@show_coversheet)
+        @hash           = @plan.as_pdf(nil, @show_coversheet)
         @formatting     = @plan.settings(:export).formatting || @plan.template.settings(:export).formatting
         @selected_phase = @plan.phases.order("phases.updated_at DESC").first
 

app/controllers/org_admin/plans_controller.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/template_customization_transfers_controller.rb

@@ -2,6 +2,8 @@
 
 class OrgAdmin::TemplateCustomizationTransfersController < ApplicationController
 
+  include Versionable
+
   after_action :verify_authorized
 
   # POST /org_admin/templates/:id/transfer_customization
@@ -11,7 +13,15 @@ def create
     @template = Template.find(params[:template_id])
     authorize @template, :transfer_customization?
     if @template.upgrade_customization?
+      # If the customized template is not published it will not version, so publish it!
+      previously_published = @template.published?
+      @template.publish unless previously_published
+
       @new_customization = @template.upgrade_customization!
+
+      # Reset the published flag if the customized template was not previously published
+      @template.update(published: false) unless previously_published
+
       redirect_to org_admin_template_path(@new_customization)
     else
       flash[:alert] = _("That template is no longer customizable.")