raggedstaff/openfoodnetwork
1
0
Fork 0
mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-02-24 01:13:21 +00:00
Code Issues Packages Projects Releases Wiki Activity
31,934 Commits 16 Branches 454 Tags
17eb8d5cd851663bf8ecb016f737a58fe103b283
Commit Graph

31934 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
dependabot[bot]
5a2f791d58 chore(deps): bump stripe from 11.0.0 to 11.1.0 
Bumps [stripe](https://github.com/stripe/stripe-ruby) from 11.0.0 to 11.1.0.
- [Release notes](https://github.com/stripe/stripe-ruby/releases)
- [Changelog](https://github.com/stripe/stripe-ruby/blob/master/CHANGELOG.md)
- [Commits](https://github.com/stripe/stripe-ruby/compare/v11.0.0...v11.1.0)

---
updated-dependencies:
- dependency-name: stripe
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
 2024-04-17 09:43:21 +00:00
cyrillefr
456905e69f Fix Rails/WhereExists rubocop offenses 
- after discussion, dev team decided not to follow
- this particular rule, but rather to enforce the where().exists? rule
  instead.
- cf. https://github.com/openfoodfoundation/openfoodnetwork/pull/12363
 2024-04-17 10:37:18 +02:00
David Cook
a2255e62d4 Revert "Use POST for action that creates data," 
I'm not happy about it, but we need it to be a standard link to make it work. I assume it's because BulkFormController.preventLeavingChangedForm() isn't smart enough.

This reverts commit 91f0a80189.
 2024-04-17 17:36:05 +10:00
David Cook
11541c9270 Disable turbo for those links 
Now we can warn that "Changes that you made might not be saved"
 2024-04-17 17:35:17 +10:00
David Cook
8f9d8b5fb8 Revert "Prevent frame navigations when form is changed" 
It was too hacky and had issues. Let's just disable Turbo for those links for now.

This reverts commit 1d1169b478.
 2024-04-17 17:26:49 +10:00
David Cook
91f0a80189 Use POST for action that creates data, 
duh.

Turbo cleverly pre-fetches GET requests to save loading time. But that resulted in dozens of unwanted clones.
Attack of the clones!!!

I checked: even though this route predates the new products screen, it wasn't being used anywhere else. The old products screen uses the API instead.
 2024-04-17 15:18:13 +10:00
David Cook
1d1169b478 Prevent frame navigations when form is changed 
This is a hacky hack, filling a gap in Turbo.
 2024-04-17 15:17:59 +10:00
David Cook
06f67488a9 Open links outside of frame by default 
This page is big enough and it's hard to see how everything works. So links work like links by default (eg edit and clone). Other links and forms are special, and will reload only the frame: this is now explicit in the code.
 2024-04-17 15:17:59 +10:00
David Cook
acc72514de Fix spec 2024-04-17 15:17:59 +10:00
David Cook
1abb068a00 Enable morphing? 
I can't really prove if this is working, but it seems to be rendering slightly faster.
 2024-04-17 15:17:59 +10:00
David Cook
508ebab75b Add loading spinner to turbo frame 
That was surprisingly easy. Note that it's still shared with SR.

It hides a bit early though: when the web response returns, but before the DOM has been rendered. Something to optimise in the future.
 2024-04-17 15:17:59 +10:00
David Cook
6c9a47854a Submit forms with Turbo Frame 
Now the filters, pagination and product forms submit and load within the frame, and work perfectly, yay!

It's still building the whole page on the server.. I think we need Turbo Streams if we want to send back just a partial.
 2024-04-17 15:17:59 +10:00
David Cook
9d6ef2f730 Avoid style issues with Turbo 
But the filter dropdowns still get duplicated. So weird..
 2024-04-17 15:17:59 +10:00
David Cook
f17b0d176b Enable Turbo Drive on products page 
Forms now load without a full page rebuild.
This is not really faster, but a bit smoother because it avoids a full page render in the browser. The default Turbo loading indicator is shown (blue line at top).

But the bulk_update form breaks... hmm
On to the next level!
 2024-04-17 15:17:59 +10:00
David Cook
72ce3a01a9 Ensure search terms and filters are retained when saving 2024-04-17 15:17:59 +10:00
Maikel Linke
eb791bed27 Test all files with Rubocop, not just added code in the diff 2024-04-17 09:44:43 +10:00
Maikel
b624965883 Merge pull request #12387 from openfoodfoundation/dependabot/bundler/redis-5.2.0 
chore(deps): bump redis from 5.1.0 to 5.2.0
 2024-04-17 09:06:23 +10:00
Maikel
f5b6a14aba Merge pull request #12386 from openfoodfoundation/dependabot/bundler/rubocop-1.63.2 
chore(deps-dev): bump rubocop from 1.63.1 to 1.63.2
 2024-04-17 09:05:02 +10:00
Maikel
a27999f224 Merge pull request #12385 from openfoodfoundation/dependabot/bundler/rspec-sql-0.0.2 
chore(deps-dev): bump rspec-sql from 0.0.1 to 0.0.2
 2024-04-17 08:24:03 +10:00
kellyzhangg
adad631efa Merge branch 'openfoodfoundation:master' into 8633-payments-controller-test 2024-04-16 15:34:21 -04:00
Kelly
954125b7f6 style improvements after running rubocop 2024-04-16 15:30:21 -04:00
Kelly
1ad544820c completed payments_controller_spec testing 2024-04-16 15:21:49 -04:00
Kelly
7d814e739d added objects necessary for testing - user, order, payment 2024-04-16 15:09:21 -04:00
Kelly
d163080115 added test for if user isn't logged in for payments_controller 2024-04-16 14:52:17 -04:00
Konrad
31c1eee593 Merge pull request #11958 from filipefurtad0/adds_missing_keys_from_i18n_tasks_output 
Adds missing keys from i18n tasks output
 2024-04-16 13:14:29 +02:00
dependabot[bot]
ef3a41203d chore(deps): bump redis from 5.1.0 to 5.2.0 
Bumps [redis](https://github.com/redis/redis-rb) from 5.1.0 to 5.2.0.
- [Changelog](https://github.com/redis/redis-rb/blob/master/CHANGELOG.md)
- [Commits](https://github.com/redis/redis-rb/compare/v5.1.0...v5.2.0)

---
updated-dependencies:
- dependency-name: redis
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
 2024-04-16 09:58:51 +00:00
dependabot[bot]
f6f0622e9b chore(deps-dev): bump rubocop from 1.63.1 to 1.63.2 
Bumps [rubocop](https://github.com/rubocop/rubocop) from 1.63.1 to 1.63.2.
- [Release notes](https://github.com/rubocop/rubocop/releases)
- [Changelog](https://github.com/rubocop/rubocop/blob/master/CHANGELOG.md)
- [Commits](https://github.com/rubocop/rubocop/compare/v1.63.1...v1.63.2)

---
updated-dependencies:
- dependency-name: rubocop
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
 2024-04-16 09:54:23 +00:00
dependabot[bot]
0c319bea2c chore(deps-dev): bump rspec-sql from 0.0.1 to 0.0.2 
Bumps [rspec-sql](https://github.com/datafoodconsortium/connector-ruby) from 0.0.1 to 0.0.2.
- [Release notes](https://github.com/datafoodconsortium/connector-ruby/releases)
- [Changelog](https://github.com/datafoodconsortium/connector-ruby/blob/main/CHANGELOG.md)
- [Commits](https://github.com/datafoodconsortium/connector-ruby/commits)

---
updated-dependencies:
- dependency-name: rspec-sql
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
 2024-04-16 09:53:18 +00:00
Maikel Linke
5cd53e0b5e Clean up MailSettings spec 
Best viewed with whitespace ignored.
 2024-04-16 16:44:12 +10:00
Maikel Linke
1fc4270613 Remove indirection from MailSettings 
We can simply merge the option hashes now because they are not
conditional anymore. Well, the magic `presence` method does the
conditional logic for us now.
 2024-04-16 16:40:52 +10:00
Maikel Linke
7e2fcede61 Further simplify mail options logic 
We were always adding this option anyway, so why not declare it to start
with?
 2024-04-16 16:40:52 +10:00
Maikel Linke
a41019fbff Simplify SMTP auth method selection 
Instead of using the auth method name, let's just not supply username
and password when we don't want to authenticate. The two affected
servers AU and CA don't have credentials set anyway. This is compatible.

The specs needed changing though.
 2024-04-16 16:40:50 +10:00
Maikel Linke
d6f2a531aa Don't pass invalid auth method "None" to net-smtp 
It's our magic word to not pass username and password on.
 2024-04-16 16:18:49 +10:00
Maikel Linke
9d09d5aff1 Allow Dependabot to open as many PRs as it likes 2024-04-16 11:19:27 +10:00
David Cook
2adb69edb0 Merge pull request #12334 from dacook/buu/optimise 
[BUU] Optimisation
 2024-04-16 09:53:53 +10:00
Gaetan Craig-Riou
e33da30263 Merge pull request #12379 from openfoodfoundation/dependabot/bundler/foreman-0.88.1 
chore(deps-dev): bump foreman from 0.87.2 to 0.88.1
 2024-04-16 09:38:37 +10:00
Gaetan Craig-Riou
c30292890d Merge pull request #12378 from openfoodfoundation/dependabot/bundler/mini_portile2-2.8.6 
chore(deps): bump mini_portile2 from 2.8.5 to 2.8.6
 2024-04-16 09:33:05 +10:00
Gaetan Craig-Riou
77b9f506ab Merge pull request #12377 from openfoodfoundation/dependabot/bundler/view_component-3.12.0 
chore(deps): bump view_component from 3.11.0 to 3.12.0
 2024-04-16 09:32:19 +10:00
Gaetan Craig-Riou
5371258125 Merge pull request #12366 from openfoodfoundation/dependabot/bundler/stripe-11.0.0 
chore(deps): bump stripe from 10.15.0 to 11.0.0
 2024-04-16 09:16:49 +10:00
filipefurtad0
91769574e3 Removes unecessary key your_cart_is_empty 2024-04-15 15:16:30 +01:00
filipefurtad0
bfd4b730f2 Combines keys taxon_edit and taxonomy_edit 2024-04-15 15:07:52 +01:00
filipefurtad0
d2c2e20822 Removes #connect.pane files 
_learn and _connect seem to appear at the top of the homepage (and not as pane). Also, there was some hard coded URLs which seems not to be used, as the translations in the Configuration/Content section seem to work correctly.
 2024-04-15 15:05:53 +01:00
filipefurtad0
269811584b Updates file to latest state 
Deletes file

We only needed this file for tracking progress, during review, we should not keep it in master I think
 2024-04-15 15:05:53 +01:00
filipefurtad0
83c74bcc77 Updates existing translation on master 
Done to prevent/fix merge conflicts
 2024-04-15 15:05:53 +01:00
filipefurtad0
f08c1ca51d Updates missing translations file 2024-04-15 15:05:53 +01:00
filipefurtad0
4a7cb601e6 Added missing keys 
Adds string to missing key

To be squashed
 2024-04-15 15:05:53 +01:00
filipefurtad0
579357dcfa Updates missing translations file 2024-04-15 15:05:53 +01:00
filipefurtad0
08ccdf07c9 Adds missing key thank_you_for_your_order 2024-04-15 15:05:53 +01:00
filipefurtad0
a2a951a18e Updates missing translations file 2024-04-15 15:05:53 +01:00
filipefurtad0
8a9b728ac7 Updates missing translations file 2024-04-15 15:05:53 +01:00