raggedstaff/openfoodnetwork
1
0
Fork 0
mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-01-24 20:36:49 +00:00
Code Issues Packages Projects Releases Wiki Activity
30,900 Commits 21 Branches 450 Tags
ac1595e718fd1bf15eeec1503fa6bdcc4fa83489
Commit Graph

30900 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Ahmed Ejaz
ac1595e718 12314 - remove shared distributor partial 
- this was only used in the enterprise show view
- the above view was deleted here 4f2389e257
- by removing this, we can remove distributor_link_class method
- it will also fix the rubocop error
 2024-03-31 18:08:22 +05:00
Ahmed Ejaz
3bb44cfe6d 12314 - fix order helper rubocop errors 
- remove the direct access of @order instance variable
- add an attr_reader for order and use it instead
 2024-03-31 17:07:00 +05:00
Ahmed Ejaz
19e3dc077e 12314: remove Rails/HelperInstanceVariable from rubocop todo 2024-03-31 17:04:15 +05:00
Maikel
d8641bf576 Merge pull request #12268 from dacook/buu/change-variant-unit-11061 
[BUU] Change variant unit values
v4.4.37 		2024-03-28 16:19:33 +11:00
David Cook
4498e91e90 Update all locales with the latest Transifex translations 2024-03-28 16:18:36 +11:00
David Cook
116547d2d2 Merge pull request #12305 from Pauloparakleto/feat/12297-rvm-support-script-setup 
Feat/12297 rvm support script setup
 2024-03-28 09:14:51 +11:00
Pauloparakleto
80db511fe5 remove rvm script. It is called directly in script/setup 2024-03-27 10:11:21 -03:00
Pauloparakleto
3a2cb3e415 call rvm directly 2024-03-27 10:11:21 -03:00
David Cook
15c93a8e95 Add -v flag to avoid script exit 2024-03-27 10:11:21 -03:00
David Cook
4a4135f261 Simplify condition, in favour of rbenv 
If rbenv is installed, we'll favour that because that's what is currently supported.
 2024-03-27 10:11:21 -03:00
Pauloparakleto
0cd4682e36 chore(GETTING_STARTED.md): Add RVM alternative to installation guide. 2024-03-27 10:11:10 -03:00
Pauloparakleto
1d6323c520 chore(script/rvm-install): Add support to RVM. Use rvm command to install ruby version in variable. 
RVM already print the logs. No need to printf message here.
RVM already skip installation if already done with logs.
 2024-03-27 10:10:21 -03:00
Pauloparakleto
8b591b7d21 chore(script/setup): Add support to RVM. Only evaluate to rbenv if rvm path is not found. 2024-03-27 10:08:50 -03:00
David Cook
266e94eba8 Fixup spec 2024-03-27 20:20:20 +11:00
David Cook
b9b2c876cc Ensure value always shows 
Even thought it's not valid (you can't save items with an empty name), it's disconcerting when the value suddenly disappears from view.
 2024-03-27 20:20:20 +11:00
David Cook
99121943a7 Fix bug 
I missed a bit in a refactor, and it wasn't covered by the spec.
 2024-03-27 20:20:20 +11:00
David Cook
b2881bb169 Add JS specs 
Converted using  https://www.codeconvert.ai/coffeescript-to-javascript-converter
With plenty of manual fixes required too..
 2024-03-27 20:20:20 +11:00
David Cook
11b8a01220 Move Jest config to a file 
With the help of 'jest --init'

I didn't end up using this, but it seems worth keeping config out of package.json
 2024-03-27 20:20:20 +11:00
David Cook
924701e161 Load available units from system config 
I'm not sure what's the best way to load data into javascript.. this works.
 2024-03-27 20:20:20 +11:00
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