ElixirTeSS: merge fork

[nrmay]

Collaborate with ElixirTeSS maintainers to merge the DReSA fork back into the ElixirTess codebase.

• Create Todo list

[fbacall]

Hi, I've been working on this merge a bit over the last few weeks.

I extracted out some DReSA-specific branding, and things that I thought were too specific to have a configuration option.

Here's a branch that contains the merge, along with an extra commit at the head to re-apply all the DReSA-specific changes: https://github.com/ElixirTeSS/TeSS/tree/dresa

Comparison: master...ElixirTeSS:dresa

I didn't open a PR because I thought you might want to keep it on a separate branch as it contains changes that could potentially break your production environment.

Some changes to be aware of:

• Some changes to the tess.yml config file: packages were renamed to collections, and there is an extra option to enable sources under the features section.
• There are some open issues with the TeSS docker setup (Docker issues ElixirTeSS/TeSS#680), so I'd recommend continuing not to use it. However, in the version of the sunspot gem we are using, it no longer bundles Solr, so if you are using that in your production deployment (rake sunspot:solr:start), that will no longer work*.
• I18n changes were moved into subfolder locales/overrides/dresa.en.yml instead of using a locale file (this folder gets ignored in the test environment to prevent string changes breaking tests).
• Style changes were moved into a single SASS file app/assets/stylesheets/themes/dresa.scss which gets included in a single line in app/assets/stylesheets/mixins/variables.scss.
• I moved around various other changes to reduce the likelihood of conflicts in future merges.

* You can choose to run solr through docker: docker-compose up -d solr (This is what we are currently using in our production instance), or you can install it and run it natively (some info here from one of our other applications: https://docs.seek4science.org/tech/setting-up-solr#installing-apache-solr).

[nrmay]

Hi Finn,Thanks for the update. I've just deployed the latest version of DReSA (v1.4.2) to production. This includes upgrades to ruby (2.7.2) and rails (5.2.8), which will allow me to look at upgrading to ruby 3 and rails 6. My first priority is to dockerize our deployment, but I can investigate merging this fork in parallel. I'll keep you posted as to progress.Cheers,Nick. -------- Original message --------From: Finn Bacall ***@***.***> Date: 7/6/22 06:33 (GMT+10:00) To: nrmay/TeSS ***@***.***> Cc: Nick May ***@***.***>, Assign ***@***.***> Subject: Re: [nrmay/TeSS] ElixirTeSS: merge fork (Issue #358) Hi, I've been working on this merge a bit over the last few weeks. I extracted out some DReSA-specific branding, and things that I thought were too specific to have a configuration option. Here's a branch that contains the merge, along with an extra commit at the head to re-apply all the DReSA-specific changes: https://github.com/ElixirTeSS/TeSS/tree/dresa Comparison: master...ElixirTeSS:dresa I didn't open a PR because I thought you might want to keep it on a separate branch as it contains changes that could potentially break your production environment. Some changes to be aware of: Some changes to the tess.yml config "notranslate">packages were renamed to collections, and there is an extra option to enable sources under the features section. There are some open issues with the TeSS docker setup (ElixirTeSS#680), so I'd recommend continuing not to use it. However, in the version of the sunspot gem we are using, it no longer bundles Solr, so if you are using that in your production deployment (rake sunspot:solr:start), that will no longer work*. I18n changes were moved into subfolder locales/overrides/dresa.en.yml instead of using a locale file (this folder gets ignored in the test environment to prevent string changes breaking tests). Style changes were moved into a single SASS file app/assets/stylesheets/themes/dresa.scss which gets included in a single line in app/assets/stylesheets/mixins/variables.scss. I moved around various other changes to reduce the likelihood of conflicts in future merges. * You can choose to run solr through docker: docker-compose up -d solr (This is what we are currently using in our production instance), or you can install it and run it natively (some info here from one of our other applications: https://docs.seek4science.org/tech/setting-up-solr#installing-apache-solr). —Reply to this email directly, view it on GitHub, or unsubscribe.You are receiving this because you were assigned.Message ID: ***@***.***>

[nrmay]

Hi Finn,I've had a look at the extensive changes you've made in this branch and, unfortunately, I don't see how I can merge them into the DReSA codebase in the time available. There are multiple places where you've reverted our changes, which would require us to re-apply and re-test existing features, and places where we'll have to reconfigure and test your changes to get them working in our environment and emulating our current deployment. Based on feedback from my clients and the time left before DReSA transitions into a maintenance mode, I'll be focusing on containerizing our deployment and will have to drop plans to merge with the ElixirTess codebase.Cheers,Nick. -------- Original message --------From: Finn Bacall ***@***.***> Date: 7/6/22 06:33 (GMT+10:00) To: nrmay/TeSS ***@***.***> Cc: Nick May ***@***.***>, Assign ***@***.***> Subject: Re: [nrmay/TeSS] ElixirTeSS: merge fork (Issue #358) Hi, I've been working on this merge a bit over the last few weeks. I extracted out some DReSA-specific branding, and things that I thought were too specific to have a configuration option. Here's a branch that contains the merge, along with an extra commit at the head to re-apply all the DReSA-specific changes: https://github.com/ElixirTeSS/TeSS/tree/dresa Comparison: master...ElixirTeSS:dresa I didn't open a PR because I thought you might want to keep it on a separate branch as it contains changes that could potentially break your production environment. Some changes to be aware of: Some changes to the tess.yml config "notranslate">packages were renamed to collections, and there is an extra option to enable sources under the features section. There are some open issues with the TeSS docker setup (ElixirTeSS#680), so I'd recommend continuing not to use it. However, in the version of the sunspot gem we are using, it no longer bundles Solr, so if you are using that in your production deployment (rake sunspot:solr:start), that will no longer work*. I18n changes were moved into subfolder locales/overrides/dresa.en.yml instead of using a locale file (this folder gets ignored in the test environment to prevent string changes breaking tests). Style changes were moved into a single SASS file app/assets/stylesheets/themes/dresa.scss which gets included in a single line in app/assets/stylesheets/mixins/variables.scss. I moved around various other changes to reduce the likelihood of conflicts in future merges. * You can choose to run solr through docker: docker-compose up -d solr (This is what we are currently using in our production instance), or you can install it and run it natively (some info here from one of our other applications: https://docs.seek4science.org/tech/setting-up-solr#installing-apache-solr). —Reply to this email directly, view it on GitHub, or unsubscribe.You are receiving this because you were assigned.Message ID: ***@***.***>

[fbacall]

Understood if this is not a priority given there's not much time left on the project.

Could you elaborate on which changes you felt had been reverted? Everything should still be intact on the dresa branch

Also, re: containerization, it may be helpful for you to check out: https://github.com/ElixirTeSS/TeSS/blob/docker-fixes/docs/docker.md and the other work on that branch