Merge upstream releases v4.0.0, v4.0.1, and v4.0.2 #474

aaronskiba · 2023-10-06T22:17:56Z

This is a link to a Google Sheets doc with very rough notes regarding how I resolved various conflicts while merging the three releases.

Fixes #470
Fixes #465
Fixes #430
Fixes #416
Fixes #414

… version

Usage: spring COMMAND [ARGS] Commands for Spring itself: binstub Generate Spring based binstubs. Use --all to generate a binstub for all known commands. Use --remove to revert. help Print available commands. server Explicitly start a Spring server in the foreground status Show current status. stop Stop all Spring processes for this project. Commands for your application: rails Run a rails command. The following sub commands will use Spring: console, runner, generate, destroy, test. rake Runs the rake command rspec Runs the rspec command to rebuild binstubs for the core rails components

…ers uniqueness to be case sensitive, so added case insensitivity flag to models and specs. Also added indexes for these

… no longer case sentitive

…sanitize method

See : https://github.com/stefanoeb/eslint-action

…complete test

departments was broken. DCC Issue https://github.com/DigitalCurationCentre/DMPonline-Service/issues/710 The fix involved making the following changes to the assign_users() and unassign_users() methods in app/controllers/api/v0/departments_controller.rb: - Removed the previous redirect_to in each method and replaced it with render users_api_v0_departments_path - Ensured the @users variable was set as follows @users = @user.org.users.includes(:department) which is the way @users is set in the users() method in the controller. The Json was called without this value during rendering.

…v4.0.0-v4.0.1-v4.0.2

Reverting a change from commit # 46eba76. This commit marks the merging of upstream release v4.0.2

This code was introduced when merging upstream release v4.0.0 (commit # 9421b57). Lines 86 and 92-96 were commented-out by me.

uat is the only config/environment that doesn't use Rails.application.routes.default_url_options[:host]

200455939-yashu · 2023-10-30T15:17:07Z

app/models/concerns/exportable_plan.rb

@@ -50,6 +51,10 @@ def as_csv(user,
          end
        end
      end
+      csv << []
+      csv << []


Lines 54 and 55 are the same!

200455939-yashu · 2023-10-30T15:24:01Z

app/models/concerns/exportable_plan.rb

@@ -183,6 +214,21 @@ def prepare_coversheet_for_csv(csv, _headings, hash)
  end
  # rubocop:enable Metrics/MethodLength, Metrics/AbcSize

+  # rubocop:disable Metrics/AbcSize
+  def prepare_research_outputs_for_csv(csv, _headings, hash)
+    return false unless hash[:research_outputs].present? && hash[:research_outputs].any?


can we directly call retrun unless instead of return false unless ?

I think here we want the false value explicitly instead of nil with just the return statement. This logic could be simplified though, we will be able to help more with this once we are more involved with core development.

200455939-yashu · 2023-10-30T15:25:53Z

app/models/concerns/exportable_plan.rb

+      csv << research_output.values
+    end
+    csv << []
+    csv << []


Do we need lines 227 and 228?

200455939-yashu

Awesome Work 😇👏

lagoan

Looks like good work! We should find time to go through the change together.

lagoan · 2023-10-30T18:56:51Z

Gemfile

@@ -318,29 +326,29 @@ group :ci, :development do

  # RuboCop is a Ruby code style checking and code formatting tool. It aims to enforce
  # the community-driven Ruby Style Guide.
-  gem 'rubocop'
+  gem 'rubocop', '~> 1.44.1' # Pinned to align with upstream v4.0.2


We should add another comment on the line above pinning the gem specifying it is for dmp assistant

lagoan · 2023-10-30T19:02:49Z

Gemfile

+  # gem 'rubocop-performance'

  # Automatic Rails code style checking tool. A RuboCop extension focused on enforcing
  # Rails best practices and coding conventions.
-  gem 'rubocop-rails'
+  # gem 'rubocop-rails'

  # A RuboCop plugin for Rake tasks
-  gem 'rubocop-rake'
+  # gem 'rubocop-rake'

  # Code style checking for RSpec files. A plugin for the RuboCop code style enforcing
  # & linting tool.
-  gem 'rubocop-rspec'
+  # gem 'rubocop-rspec'

  # Thread-safety checks via static analysis. A plugin for the RuboCop code style
  # enforcing & linting tool.
-  gem 'rubocop-thread_safety'
+  # gem 'rubocop-thread_safety'


@aaronskiba do we know why these rubocop gems were commented out?

lagoan · 2023-10-31T20:05:57Z

app/models/concerns/exportable_plan.rb

@@ -183,6 +214,21 @@ def prepare_coversheet_for_csv(csv, _headings, hash)
  end
  # rubocop:enable Metrics/MethodLength, Metrics/AbcSize

+  # rubocop:disable Metrics/AbcSize
+  def prepare_research_outputs_for_csv(csv, _headings, hash)
+    return false unless hash[:research_outputs].present? && hash[:research_outputs].any?


I think here we want the false value explicitly instead of nil with just the return statement. This logic could be simplified though, we will be able to help more with this once we are more involved with core development.

lagoan · 2023-10-31T21:11:18Z

config/environments/development.rb


 # Used by Rails' routes url_helpers (typically when including a link in an email)
-Rails.application.routes.default_url_options[:host] = "localhost:3000"
+Rails.application.routes.default_url_options[:host] = Rails.application.secrets.dmproadmap_host


We had a conversation before about the use of ENV variables. In this case, we could continue to use it since it is for the development environment, we use a lot of these variables at the moment. The production environment is where we handle it differently at this time.

@aaronskiba Will add ENV variable backl

config/environments/production.rb

'require' statement is for the `config.active_record.database_selector = { delay: 2.seconds }` statement, which we are not using. Commented lines 102-122 are for database switching, which we are also not using.

NOTE: CHANGELOG.md did not exist for upstream until release v4.0.2

…v4.0.0-v4.0.1-v4.0.2

Resulting code changes from running `bin/spring binstub --all` This fix idea comes from https://github.com/DMPRoadmap/roadmap/releases/tag/v4.1.1

lagoan

Great progress @aaronskiba , this is a huge PR so there are only a few things to look at.

lagoan · 2023-12-14T17:36:17Z

CHANGELOG.md

+## [Unreleased]
+
+### Added
+
+ - Merged Upstream Release [v4.0.0](https://github.com/DMPRoadmap/roadmap/releases/tag/v4.0.0)
+
+ - Merged Upstream Release [v4.0.1](https://github.com/DMPRoadmap/roadmap/releases/tag/v4.0.1)
+
+ - Merged Upstream Release [v4.0.2](https://github.com/DMPRoadmap/roadmap/releases/tag/v4.0.2)
+   - #### [v4.0.2](https://github.com/DMPRoadmap/roadmap/releases/tag/v4.0.2)
+
+     - ##### Added
+       - Added CHANGELOG.md and Danger Github Action [#3257](https://github.com/DMPRoadmap/roadmap/issues/3257)
+       - Added validation with custom error message in research_output.rb to ensure a user does not enter a very large value as 'Anticipated file size'. [#3161](https://github.com/DMPRoadmap/roadmap/issues/3161)
+       - Added popover for org profile page and added explanation for public plan
+       - Added rack-attack version 6.6.1 gem. https://rubygems.org/gems/rack-attack/versions/6.6.1
+
+     - ##### Fixed
+       - Fixed an issue that was preventing uses from leaving the research output byte_size field blank
+       - Patched issue that was causing template visibility to default to organizationally visible after saving
+       - Froze mail gem version [#3254](https://github.com/DMPRoadmap/roadmap/issues/3254)
+       - Updated the CSV export so that it now includes research outputs
+       - Updated sans-serif font used in PDF downloads to Roboto since Google API no longer offers Helvetica
+       - Fixed discrepencies with default/max per_page values for API and UI pagination
+       - Updated JS that used to call the TinyMCE `setMode()` function so that it now calls `mode.set()` because the former is now deprecated.
+       - Patched an issue that was causing a template's visibility to change to 'organizationally_visible' when saving on the template details page.
+       - Fixed an issue with the Rails 6 keyword arguments change that was causing the `paginable_sort_link` to fail
+
+     - ##### Changed
+       - Added scss files to EditorConfig
+       - Change csv file name for statistics from 'Completed' to 'Created'
+       - Added error message and updated saving message for plan writing session to improve user experience
+


For merging this file we can add the changes on the same indentation level as they are changes that come into that release. Nice idea of keeping the merged versions, we should keep that.

lagoan · 2023-12-14T17:38:13Z

app/views/orgs/_profile_form.html.erb

+          <%= _('Organisation Types') %>
            &nbsp; <a href="#" aria-label="<%= _('Text') %>" data-toggle="tooltip" data-placement="right" title="<%= org_types_tooltip %>">
-             <i class="fas fa-question-circle fa-reverse" ></i>
+            <i class="fas fa-question-circle fa-reverse" ></i>
            <em class="sr-only"></em>


I think we were going to verify the tooltips were working. Did we verify this?

Keep upstream's changelog entries inline with our own.

lagoan

benjaminfaure and others added 30 commits June 14, 2022 15:53

Updated Ruby version to 2.7.6

efa9fc6

Updated Ruby version in github workflow files

46b4fc7

Rubocoped some files

66a5d66

tweak ruby version designation in gemfile to just specify major.minor…

b4e7c10

… version

discovered issue running specs on mysql. new version of mysqld consid…

d54c68a

…ers uniqueness to be case sensitive, so added case insensitivity flag to models and specs. Also added indexes for these

finally fixed autocomplete/typeahead helper for specs

20e6b0b

rubocop fixes and fix for index names in migration

2085e7d

fix for outdated db schema

343b9d0

Removed case_sensitivity test on region abbreviation as this field is…

1dcf697

… no longer case sentitive

removed db migration that added unqiueness indexes

6096cf7

comment out rspec migration step

b503726

updated github actions to use the binstubs

158cc5a

try bundle exec instead of bin/ in github workflows

110475e

readd case_insensitive check to region

538e339

updates to tests

6aa7ca2

Unpegged mimemagic & pegged font-awesome gem to the major version

b7ace8f

Replaced turbolinks (no longer maintained) by turbo-rails

71965be

Removed zaru gem and replaced it by built in ActiveStorage::Filename#…

310359c

…sanitize method

Commented some unused gems

ac95461

query optomizations based on feedback from Bullet

f2c71db

attempt to fix randomly failing api v1 deserializer test

80b2ac0

Updated ESLint to V8 & replace eslint-loaded by eslint-plugin-import

aeb683c

Removed eslint-action as github has now everything to run ESLint

cbbb17b

See : https://github.com/stefanoeb/eslint-action

Fixed eslint action

695c66a

Fixed eslint action

648c805

Removed deprecated option from tinymce config

d6904a5

Upgraded jasmine, jasmine-core & karma-jasmine. Fixed one of the auto…

b779346

…complete test

Upgraded chart.js to V3

e3a37d4

aaronskiba added 2 commits October 23, 2023 10:15

Merge branch 'deployment-portage' into aaron/merge-upstream-releases-…

42b6a66

…v4.0.0-v4.0.1-v4.0.2

Fix org_types_tooltip format for translation.io

8c94f6b

Reverting a change from commit # 46eba76. This commit marks the merging of upstream release v4.0.2

aaronskiba marked this pull request as ready for review October 23, 2023 21:35

aaronskiba added 5 commits October 23, 2023 15:40

Update CHANGELOG.md

6f66d55

Remove commented out logger code

324044f

This code was introduced when merging upstream release v4.0.0 (commit # 9421b57). Lines 86 and 92-96 were commented-out by me.

Set up dmproadmap_host secret

cf811d1

Remove en-GB from translation.io supported locales

44bfd76

add config.host secret to sandbox, staging, & uat

b7f20f4

uat is the only config/environment that doesn't use Rails.application.routes.default_url_options[:host]

200455939-yashu reviewed Oct 30, 2023

View reviewed changes

200455939-yashu previously approved these changes Nov 3, 2023

View reviewed changes

This was referenced Nov 6, 2023

Remove 'en-GB' From translation.io Locales #516

Closed

Unpin Rubocop #515

Open

lagoan requested changes Nov 15, 2023

View reviewed changes

aaronskiba added 4 commits November 23, 2023 14:34

Config host with ENV (not secret) for development

fe4e181

remove unused 'require' statement + commented code

99c7445

'require' statement is for the `config.active_record.database_selector = { delay: 2.seconds }` statement, which we are not using. Commented lines 102-122 are for database switching, which we are also not using.

Add CHANGELOG.md changes from Release v4.0.2

df8d7ce

NOTE: CHANGELOG.md did not exist for upstream until release v4.0.2

Edit rubocop pinning comment in Gemfile

aacb5c1

aaronskiba dismissed 200455939-yashu’s stale review via aacb5c1 November 23, 2023 22:00

aaronskiba added 4 commits November 23, 2023 16:14

put back end (fix commit fe4e181)

f157edb

Merge branch 'deployment-portage' into aaron/merge-upstream-releases-…

0f91dc3

…v4.0.0-v4.0.1-v4.0.2

Stop Spring reload in production mode

f4fe589

Resulting code changes from running `bin/spring binstub --all` This fix idea comes from https://github.com/DMPRoadmap/roadmap/releases/tag/v4.1.1

Flagshihtzu fix to allow Docker GH action to pass

8d19410

lagoan requested changes Dec 19, 2023

View reviewed changes

Edit Alignment of Changelog entries

5772e2e

Keep upstream's changelog entries inline with our own.

lagoan approved these changes Dec 20, 2023

View reviewed changes

aaronskiba merged commit 1fca7e6 into deployment-portage Dec 20, 2023
11 checks passed

aaronskiba deleted the aaron/merge-upstream-releases-v4.0.0-v4.0.1-v4.0.2 branch December 20, 2023 17:07

aaronskiba mentioned this pull request Dec 20, 2023

Incoming Translations For 'template header error' From Upstream #517

Closed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Merge upstream releases v4.0.0, v4.0.1, and v4.0.2 #474

Merge upstream releases v4.0.0, v4.0.1, and v4.0.2 #474

aaronskiba commented Oct 6, 2023 •

edited

Loading

200455939-yashu Oct 30, 2023

200455939-yashu Oct 30, 2023

lagoan Oct 31, 2023

200455939-yashu Oct 30, 2023

200455939-yashu left a comment

lagoan left a comment

lagoan Oct 30, 2023

lagoan Oct 30, 2023

lagoan Oct 31, 2023

lagoan Oct 31, 2023

lagoan Nov 20, 2023

lagoan left a comment

lagoan Dec 14, 2023

lagoan Dec 14, 2023

lagoan left a comment

Merge upstream releases v4.0.0, v4.0.1, and v4.0.2 #474

Merge upstream releases v4.0.0, v4.0.1, and v4.0.2 #474

Conversation

aaronskiba commented Oct 6, 2023 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

200455939-yashu left a comment

Choose a reason for hiding this comment

lagoan left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

lagoan left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

lagoan left a comment

Choose a reason for hiding this comment

aaronskiba commented Oct 6, 2023 •

edited

Loading