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
30,881 Commits 16 Branches 454 Tags
1d8ed67b0bd5657f62e6e689fd4d02fbc1bdaed6
Commit Graph

30881 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
David Cook
1d8ed67b0b Handle unit scale changes 
As discussed, this is the desired behaviour. The current screen appears to do this, but fails to save the changes.
 2024-03-27 20:20:20 +11:00
David Cook
d238fc0cad TODO: optimise and fix bug 2024-03-27 20:20:20 +11:00
David Cook
4ddb2ff1e9 Generate unit display with OptionValueNamer 2024-03-27 20:20:20 +11:00
David Cook
cf31d09ad8 Prevent submitting empty value 2024-03-27 20:20:20 +11:00
David Cook
49226ffdbc Extract unit_value and unit_description values 
Copied from display_as.js.coffee (ofn.admin.ofnDisplayAs.variantUnitProperties).
 2024-03-27 20:20:20 +11:00
David Cook
c98956bf5a Add variant controller 
This will manage the various unit fields. Maybe it should have a more specific name.
 2024-03-27 20:20:16 +11:00
David Cook
9beaf0a0c2 Use textContent FTW 
Oh look, the test works better now too.
 2024-03-27 17:35:09 +11:00
David Cook
6291cce5d1 Fix style for empty popout button 
There's still an odd 1px height change on hover that I can't track down. I think it would be better to just give new variants a default of 1 (blank is not valid anyway).
 2024-03-27 17:35:09 +11:00
David Cook
e589605e3c Rename popout style classes 2024-03-27 17:35:08 +11:00
David Cook
e110cd1145 Fix popout to focus first _visible_ field 2024-03-27 14:34:31 +11:00
David Cook
26723194d5 Prevent popout from updating display value 
Watch out, HAML will strip an attribute with boolean false, so we need to use a string. Or reconsider using false as a default value..

I wish Jest had the rspec concept of `let`.
 2024-03-27 14:34:31 +11:00
David Cook
e94fddb0f8 Style label in popout 
And tweaked global style as per design.
And cleanup unused classes.
 2024-03-27 14:34:31 +11:00
David Cook
4f7d50ca4b Refactor CSS to reduce scope 
We don't want the fields inside the popout to be naked, so need to be more specific.
 2024-03-27 14:34:31 +11:00
David Cook
f13f2cfa2f Move values to variables 
I didn't end up using these, but it's probably worth keeping for consistency.
 2024-03-27 14:34:31 +11:00
David Cook
4a776233db Move fields into a popout 2024-03-27 14:34:31 +11:00
David Cook
436f733213 Add variant unit fields 
Unfortunately we can't use an input[type=number] because you're allowed to type text for unit_description.

These fields will be conditionally shown/hidden in upcoming steps.
 2024-03-27 14:34:31 +11:00
David Cook
a5741a1ca8 Sync hidden variant unit fields 
This will be necessary for managing the 'display as' state.
..or is it?
 2024-03-27 14:34:19 +11:00
David Cook
45b4e6c87c Add comments 
To save me or someone else having to figure it out again.
 2024-03-27 14:33:32 +11:00
David Cook
189cd88848 Remove duplicate spec 
Must have been an accident while merging conflicts
 2024-03-27 14:33:32 +11:00
David Cook
9b040d87f6 Update spec 2024-03-27 14:33:32 +11:00
Gaetan Craig-Riou
924bb2a003 Merge pull request #12315 from openfoodfoundation/dependabot/bundler/bugsnag-6.26.4 
chore(deps): bump bugsnag from 6.26.3 to 6.26.4
 2024-03-27 10:07:26 +11:00
Gaetan Craig-Riou
9c06032077 Merge pull request #12312 from openfoodfoundation/dependabot/npm_and_yarn/express-4.19.2 
chore(deps): bump express from 4.18.2 to 4.19.2
 2024-03-27 09:29:10 +11:00
Filipe
50242d8821 Merge pull request #12306 from Matt-Yorkley/current-configs 
Reduce unnecessary avalanches of Redis queries
 2024-03-26 14:34:08 +00:00
Matt-Yorkley
c01bab5f27 Wrap commonly-repeated calls to Spree::Config to reduce unnecessary cache reads 
These config values are relatively static but in some cases they can be called many times in the same request (like rendering a report or a large list of line_items in BOM). These values will now only get fetched from Redis/Postgres once at most per request/job.
 2024-03-26 13:39:16 +00:00
Filipe
7be06fc38c Merge pull request #12307 from Matt-Yorkley/report-form-loading 
Don't generate packing reports twice just to show the form
 2024-03-26 12:42:45 +00:00
dependabot[bot]
df50485b62 chore(deps): bump bugsnag from 6.26.3 to 6.26.4 
Bumps [bugsnag](https://github.com/bugsnag/bugsnag-ruby) from 6.26.3 to 6.26.4.
- [Release notes](https://github.com/bugsnag/bugsnag-ruby/releases)
- [Changelog](https://github.com/bugsnag/bugsnag-ruby/blob/master/CHANGELOG.md)
- [Commits](https://github.com/bugsnag/bugsnag-ruby/compare/v6.26.3...v6.26.4)

---
updated-dependencies:
- dependency-name: bugsnag
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
 2024-03-26 10:01:03 +00:00
David Cook
6240f37adf Merge pull request #12308 from dacook/update-rails-nested-form 
chore(deps): update rails-nested-form from fork to v5.0.0
 2024-03-26 13:26:50 +11:00
Maikel
d1e492bb99 Merge pull request #12310 from openfoodfoundation/dependabot/bundler/rubocop-rails-2.24.1 
chore(deps-dev): bump rubocop-rails from 2.24.0 to 2.24.1
 2024-03-26 12:14:59 +11:00
David Cook
f8a7635463 Regenerate Rubocop's TODO file 
Using params in script/rubocop-autocorrect.sh:

   bundle exec rubocop --regenerate-todo --no-auto-gen-timestamp

And yay, no new violations!
 2024-03-26 09:39:07 +11:00
dependabot[bot]
9be929e572 chore(deps): bump express from 4.18.2 to 4.19.2 
Bumps [express](https://github.com/expressjs/express) from 4.18.2 to 4.19.2.
- [Release notes](https://github.com/expressjs/express/releases)
- [Changelog](https://github.com/expressjs/express/blob/master/History.md)
- [Commits](https://github.com/expressjs/express/compare/4.18.2...4.19.2)

---
updated-dependencies:
- dependency-name: express
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
 2024-03-25 22:32:04 +00:00
David Cook
7af1fcaabb Merge pull request #12311 from openfoodfoundation/dependabot/bundler/rdoc-6.6.3.1 
chore(deps-dev): bump rdoc from 6.6.2 to 6.6.3.1
 2024-03-26 09:31:22 +11:00
dependabot[bot]
8845161a8e chore(deps-dev): bump rdoc from 6.6.2 to 6.6.3.1 
Bumps [rdoc](https://github.com/ruby/rdoc) from 6.6.2 to 6.6.3.1.
- [Release notes](https://github.com/ruby/rdoc/releases)
- [Changelog](https://github.com/ruby/rdoc/blob/master/History.rdoc)
- [Commits](https://github.com/ruby/rdoc/compare/v6.6.2...v6.6.3.1)

---
updated-dependencies:
- dependency-name: rdoc
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
 2024-03-25 19:50:54 +00:00
dependabot[bot]
ea584504bd chore(deps-dev): bump rubocop-rails from 2.24.0 to 2.24.1 
Bumps [rubocop-rails](https://github.com/rubocop/rubocop-rails) from 2.24.0 to 2.24.1.
- [Release notes](https://github.com/rubocop/rubocop-rails/releases)
- [Changelog](https://github.com/rubocop/rubocop-rails/blob/master/CHANGELOG.md)
- [Commits](https://github.com/rubocop/rubocop-rails/compare/v2.24.0...v2.24.1)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2024-03-25 09:32:02 +00:00
Gaetan Craig-Riou
3b2d8967ad Merge pull request #12302 from openfoodfoundation/dependabot/bundler/stripe-10.13.0 
chore(deps): bump stripe from 10.12.0 to 10.13.0
 2024-03-25 13:12:54 +11:00
David Cook
52a36f33bc Merge pull request #12298 from mkllnk/devise-links 
Remove unused Devise login links partial
 2024-03-25 12:57:39 +11:00
Gaetan Craig-Riou
502d7c6d4a Update Stripe API recordings for new version 2024-03-25 12:07:08 +11:00
David Cook
6b2c54a25e Update event name 
The event name has changed in the official release.
 2024-03-25 11:01:23 +11:00
David Cook
51404f4d66 chore(deps): update rails-nested-form from fork to v5.0.0 
We were using our own fork, while waiting for a new feature to be merged. It's now been released, albeit with a modification. The gem has changed it's name too.
 2024-03-25 11:00:51 +11:00
Matt-Yorkley
fc1b686938 Don't generate packing reports unnecessarily when displaying the report form 2024-03-24 16:36:50 +00:00
dependabot[bot]
c0fd08d44e chore(deps): bump stripe from 10.12.0 to 10.13.0 
Bumps [stripe](https://github.com/stripe/stripe-ruby) from 10.12.0 to 10.13.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/v10.12.0...v10.13.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-03-22 09:24:29 +00:00
Maikel Linke
42520216aa Update all locales with the latest Transifex translations v4.4.35 2024-03-22 15:34:25 +11:00
Maikel
ce24e6ecd6 Merge pull request #12257 from openfoodfoundation/dependabot/npm_and_yarn/hotwired/turbo-8.0.4 
chore(deps): bump @hotwired/turbo from 8.0.3 to 8.0.4
 2024-03-22 15:32:41 +11:00
Maikel
4c1268b3ce Merge pull request #12274 from mkllnk/dfc-product-import 
Import products from DFC catalog
 2024-03-22 09:25:02 +11:00
dependabot[bot]
3455ffd507 chore(deps): bump @hotwired/turbo from 8.0.3 to 8.0.4 
Bumps [@hotwired/turbo](https://github.com/hotwired/turbo) from 8.0.3 to 8.0.4.
- [Release notes](https://github.com/hotwired/turbo/releases)
- [Commits](https://github.com/hotwired/turbo/compare/v8.0.3...v8.0.4)

---
updated-dependencies:
- dependency-name: "@hotwired/turbo"
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
 2024-03-21 09:57:20 +00:00
Konrad
26f3b5603d Merge pull request #12246 from dacook/cable_ready-downgrade 
Downgrade cable_ready JS to 5.0.1
 2024-03-21 10:54:15 +01:00
Maikel
50acf2f484 Merge pull request #12299 from mkllnk/social-media-links 
Publish full URLs of social media links on DFC API
 2024-03-21 13:20:35 +11:00
Maikel Linke
220e459da2 Publish full URLs of social media links on DFC API 
We have a quirky way of storing social media links in our database. The
saved format results from the UI, validations and overridden getter
methods.
 2024-03-21 12:16:10 +11:00
Maikel Linke
c6e88e70c3 Remove unused Devise login links partial content 
The purpose of this file was unclear and it was flagging additional
maintenance like missing translations.
 2024-03-21 10:21:49 +11:00
David Cook
4ada3edc4e Merge pull request #12293 from Pauloparakleto/readme-node-advise 
chore(README.md): change the order the instalation guide appears and add advise about specific ruby and node versions.
 2024-03-21 09:41:10 +11:00
David Cook
579965c62c Merge pull request #12289 from anthonyms/11482-fix-rubocop-rails-issue-find_each 
Fix Rubocop Rails issue: Rails/FindEach
 2024-03-21 09:36:18 +11:00