diff --git a/CHANGELOG.md b/CHANGELOG.md index 38fa0bfc6b..a75410a722 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,12 @@ ### v5.56 - Updated gem dependencies +- Updated dependencies in `package.json` and `yarn.lock` to address security vulnerabilities. +- Fixed a bug with adding Research Outputs under `Upload Plan` section, because validation was always requiring a `url` +- Updated Dockerfiles to skip the download of `chrome-headless-shell` since we already install `chromium` via `apt-get` +- Updated webpack.config to add an alias to resolve jquery use the same instance to prevent multiple versions loading. +- Made small updates to `javscript/src/utils/accordion.js` and `views/phases/_guidances_notes.html.erb` due to package updates. +- Fixed existing bug in `controllers/contributors_controller.rb` because after editing contributor info, the panel didn't change back to the table view. ### v5.55 - Fixed bug where users could not expand their template sections because the `remove_data` field in the `conditions` table was inadvertently set to `[null]` diff --git a/Dockerfile b/Dockerfile index 9e7aa81fee..4e32c759ff 100644 --- a/Dockerfile +++ b/Dockerfile @@ -46,6 +46,8 @@ RUN apt-get -qqy update \ # Always run Node in Production for the ECS hosted environments ENV NODE_ENV=production +ENV PUPPETEER_SKIP_DOWNLOAD=true +ENV PUPPETEER_EXECUTABLE_PATH=/usr/bin/chromium RUN echo Using RAILS_ENV: ${RAILS_ENV}, NODE_ENV: ${NODE_ENV} diff --git a/Dockerfile.dev b/Dockerfile.dev index 6ae0ca3738..1d4279f55b 100644 --- a/Dockerfile.dev +++ b/Dockerfile.dev @@ -46,6 +46,8 @@ WORKDIR $INSTALL_PATH # Cleanup from build ENV RAILS_ENV development +ENV PUPPETEER_SKIP_DOWNLOAD=true +ENV PUPPETEER_EXECUTABLE_PATH=/usr/bin/chromium RUN rm -rf node_modules vendor .cache # Make sure Git isn't going to try to use SSH (for klaro dependency) diff --git a/app/controllers/contributors_controller.rb b/app/controllers/contributors_controller.rb index 6bb3d39673..8e58c86ddd 100644 --- a/app/controllers/contributors_controller.rb +++ b/app/controllers/contributors_controller.rb @@ -67,8 +67,7 @@ def update args = process_orcid_for_update(hash: args) if @contributor.update(args) - redirect_to edit_plan_contributor_path(@plan, @contributor), - notice: success_message(@contributor, _('saved')) + redirect_to plan_contributors_path(@plan), notice: success_message(@contributor, _('saved')) else flash.now[:alert] = failure_message(@contributor, _('save')) render :edit diff --git a/app/javascript/src/utils/accordion.js b/app/javascript/src/utils/accordion.js index 253893bbd9..08322579e8 100644 --- a/app/javascript/src/utils/accordion.js +++ b/app/javascript/src/utils/accordion.js @@ -46,7 +46,8 @@ $(() => { // Expands or collapses the panel according to the // direction passed (e.g. show --> expands, hide --> collapses) if (direction === 'show') { - if (!panelCollapse.find('.panel-body').attr('data-loaded') || !panelCollapse.hasClass('in')) { + if (!panelCollapse.find('.panel-body').attr('data-loaded') + || (!panelCollapse.hasClass('in') && !panelCollapse.hasClass('show'))) { panelCollapse.prev()[0].click(); } } else { diff --git a/app/views/phases/_guidances_notes.html.erb b/app/views/phases/_guidances_notes.html.erb index 8c6937e929..ffbaaf2e75 100644 --- a/app/views/phases/_guidances_notes.html.erb +++ b/app/views/phases/_guidances_notes.html.erb @@ -1,19 +1,19 @@ <%# locals: { plan, template, question, answer, guidance_presenter } %> <% guidances_active = guidance_presenter.any?(question: question) %> <% active_nav = nil %> -
+