raggedstaff/openfoodnetwork
1
0
Fork 0
mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-01-25 20:46:48 +00:00
Code Issues Packages Projects Releases Wiki Activity
30,347 Commits 21 Branches 450 Tags
d892e00cdd51e080a2f7cde407ebdbe812bebbc2
Commit Graph

30347 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Gaetan Craig-Riou
d892e00cdd Merge pull request #12083 from openfoodfoundation/dependabot/bundler/rubocop-1.60.2 
chore(deps-dev): bump rubocop from 1.59.0 to 1.60.2
 2024-01-29 11:15:19 +11:00
Gaetan Craig-Riou
8bb1e03808 Merge pull request #12081 from openfoodfoundation/dependabot/bundler/bugsnag-6.26.3 
chore(deps): bump bugsnag from 6.26.2 to 6.26.3
 2024-01-29 11:12:07 +11:00
Gaetan Craig-Riou
d39fecccb1 Merge pull request #12079 from mkllnk/pretty 
Remove automatic pre-commit hook
 2024-01-29 11:10:52 +11:00
Gaetan Craig-Riou
d5499245d0 Merge pull request #11698 from openfoodfoundation/dependabot/bundler/redis-5.0.8 
chore(deps): bump redis from 4.8.1 to 5.0.8
 2024-01-29 10:55:58 +11:00
Rachel Arnould
6fecd57c69 Merge pull request #12048 from dacook/buu/add-product-images-11065 
[BUU] Add new product images
 2024-01-25 16:44:02 +01:00
Rachel Arnould
96d2021b72 Merge branch 'master' into buu/add-product-images-11065 2024-01-25 16:32:45 +01:00
dependabot[bot]
a1120c6b06 chore(deps-dev): bump rubocop from 1.59.0 to 1.60.2 
Bumps [rubocop](https://github.com/rubocop/rubocop) from 1.59.0 to 1.60.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.59.0...v1.60.2)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2024-01-25 09:32:15 +00:00
dependabot[bot]
3df5b0bcf9 chore(deps): bump bugsnag from 6.26.2 to 6.26.3 
Bumps [bugsnag](https://github.com/bugsnag/bugsnag-ruby) from 6.26.2 to 6.26.3.
- [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.2...v6.26.3)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2024-01-25 09:14:57 +00:00
David Cook
a005069394 Merge pull request #12041 from mkllnk/migrations 
Remove migrations with faulty ids
 2024-01-25 17:29:23 +11:00
David Cook
c3914bc7ae Merge pull request #11759 from openfoodfoundation/dependabot/npm_and_yarn/tom-select-2.3.1 
chore(deps): bump tom-select from 2.2.3 to 2.3.1
 2024-01-25 16:26:10 +11:00
David Cook
4634917597 Treat image integrity error as an input error 
And thus give the user a useful message to try again.

Hmm, if this is a good idea, we should do it everywhere we upload an image. Can we build that in somehow, or at least make a shared helper that accepts a block and catches the error?

I replicated this in dev a couple of times, I think with a text file labelled as an image file. Unfortunately, I can no longer replicate in dev or with a spec.
 2024-01-25 14:14:58 +11:00
David Cook
a915182bf8 Add tests for image controller 2024-01-25 14:14:58 +11:00
David Cook
c462ac919f Use image url helper 
Without it, I think the correct S3 url isn't generated.
 2024-01-25 14:14:58 +11:00
David Cook
f72154e40c Add image create form 
Re-using the edit image form, because they're basically the same.
 2024-01-25 14:14:58 +11:00
David Cook
07bef860b2 Add spec for updating image 2024-01-25 14:14:58 +11:00
David Cook
25f4954795 Combine spec 2024-01-25 14:14:58 +11:00
David Cook
e92f4a120a Refactor: re-organise spec file 
No code changes, just moving it around and renaming blocks. Best viewed with white-space ignored.
 2024-01-25 14:14:58 +11:00
Maikel Linke
687176cf49 Remove trouble-some hiredis 
The hiredis client was praised as being faster parsing bulk responses
but it seems to have multiple issues now:

- The redis release 5.0 moved hiredis support to another gem.
- I tried the hiredis-client gem and it raised errors.
- There are claims of worse performance of hiredis [1].
- Maintenance responsiveness has been questioned [2].

Using the default redis driver seems to work fine though.

[1]: https://discuss.rubyonrails.org/t/hiredis-does-not-support-ssl-action-cable/75945
[2]: https://github.com/redis/hiredis/issues/655
 2024-01-25 13:28:44 +11:00
dependabot[bot]
9d710652d4 chore(deps): bump redis from 4.8.1 to 5.0.8 
Bumps [redis](https://github.com/redis/redis-rb) from 4.8.1 to 5.0.8.
- [Changelog](https://github.com/redis/redis-rb/blob/master/CHANGELOG.md)
- [Commits](https://github.com/redis/redis-rb/compare/v4.8.1...v5.0.8)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2024-01-25 11:33:37 +11:00
Maikel Linke
79863fa749 Remove automatic pre-commit hook 
It slows down the `git commit` command even when you don't edit any CSS
or JS files. It also restricts you when committing work in progress.

In my opinion, the linting should happen in your IDE, not when
committing. But you can install your own pre-commit hook if you like.

We still have CI to check all contributions.
 2024-01-25 11:01:55 +11:00
Maikel Linke
1884bcf780 Update all locales with the latest Transifex translations v4.4.27 2024-01-25 10:10:20 +11:00
Konrad
773131741b Merge pull request #11817 from rioug/10809-match-taxons-to-DFC-product-types 
[DFC] match taxons to dfc product types
 2024-01-25 00:05:31 +01:00
Konrad
d15395a252 Merge pull request #12052 from dacook/hotkeys 
Hotkey fix
 2024-01-24 23:34:50 +01:00
Konrad
ca12eab4bb Merge pull request #11985 from chahmedejaz/task/11768-add-voucher-in-enterprise-fees-with-tax-by-order-report 
Include vouchers in report: Enterprise Fees With Tax Report By Order
 2024-01-24 22:57:48 +01:00
Konrad
5377304190 Merge pull request #12050 from cyrillefr/Replace-toggle_button_disabled_controller-with-generic-toggle_control_controller 
Replace toggle_button_disable controller with generic toggle_control controller
 2024-01-24 16:39:26 +01:00
Konrad
ec4bbe6241 Merge pull request #12038 from mkllnk/dfc-tax-category 
Spec requiring tax category when creating products
 2024-01-24 16:26:57 +01:00
Gaetan Craig-Riou
67dc79b074 Replace tomselect_search_and_select by tomselect_select 
In these scenarios, searching for the option is not actually required,
we can directly click on the needed option. It prevent issue with
the dropdown option staying open and breaking specs.
 2024-01-24 14:53:44 +11:00
Gaetan Craig-Riou
98545741e6 Add tomselect_select helper 
When using `tomselect_search_and_select` and searching isn't really
required it leaves the dropdown option open. It can then cause problem
when trying to interact with other element in the page. This happens
because clicking on the chosen option happena before the searching
finishes.
We can now use `tomselect_select` when searching is not actually
required.
It should not be a problem when search is required, as capybara will
wait for the option to appear on the page before clicking.
 2024-01-24 14:47:21 +11:00
Maikel
25a4e45171 Merge pull request #12070 from openfoodfoundation/dependabot/bundler/sidekiq-7.2.1 
Bump sidekiq from 7.2.0 to 7.2.1
 2024-01-24 14:21:59 +11:00
Maikel Linke
d12c0a7d9d Fixup: Remove unused method from spec 2024-01-24 12:09:02 +11:00
Gaetan Craig-Riou
270a310e0f Use send_keys to populate tom select input 
Setting the value directly doesn't trigger the search, presumably
because it doesn't trigger any javascript event.
 2024-01-23 11:52:01 +11:00
dependabot[bot]
cd9c505c6b chore(deps): bump tom-select from 2.2.3 to 2.3.1 
Bumps [tom-select](https://github.com/orchidjs/tom-select) from 2.2.3 to 2.3.1.
- [Release notes](https://github.com/orchidjs/tom-select/releases)
- [Commits](https://github.com/orchidjs/tom-select/compare/v2.2.3...v2.3.1)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2024-01-23 11:52:01 +11:00
dependabot[bot]
67d66bde06 Bump sidekiq from 7.2.0 to 7.2.1 
Bumps [sidekiq](https://github.com/sidekiq/sidekiq) from 7.2.0 to 7.2.1.
- [Changelog](https://github.com/sidekiq/sidekiq/blob/main/Changes.md)
- [Commits](https://github.com/sidekiq/sidekiq/compare/v7.2.0...v7.2.1)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2024-01-23 00:50:34 +00:00
Gaetan Craig-Riou
46b1fe713f Merge pull request #12072 from openfoodfoundation/dependabot/npm_and_yarn/js-big-decimal-2.0.7 
Bump js-big-decimal from 2.0.4 to 2.0.7
 2024-01-23 11:47:40 +11:00
Gaetan Craig-Riou
41c1b8da10 Merge pull request #12071 from openfoodfoundation/dependabot/bundler/shoulda-matchers-6.1.0 
Bump shoulda-matchers from 6.0.0 to 6.1.0
 2024-01-23 11:44:52 +11:00
dependabot[bot]
41268153c0 Bump js-big-decimal from 2.0.4 to 2.0.7 
Bumps [js-big-decimal](https://github.com/royNiladri/js-big-decimal) from 2.0.4 to 2.0.7.
- [Release notes](https://github.com/royNiladri/js-big-decimal/releases)
- [Commits](https://github.com/royNiladri/js-big-decimal/compare/v2.0.4...v2.0.7)

---
updated-dependencies:
- dependency-name: js-big-decimal
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
 2024-01-22 09:36:14 +00:00
dependabot[bot]
36f32ddca2 Bump shoulda-matchers from 6.0.0 to 6.1.0 
Bumps [shoulda-matchers](https://github.com/thoughtbot/shoulda-matchers) from 6.0.0 to 6.1.0.
- [Release notes](https://github.com/thoughtbot/shoulda-matchers/releases)
- [Changelog](https://github.com/thoughtbot/shoulda-matchers/blob/main/CHANGELOG.md)
- [Commits](https://github.com/thoughtbot/shoulda-matchers/compare/v6.0.0...v6.1.0)

---
updated-dependencies:
- dependency-name: shoulda-matchers
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
 2024-01-22 09:21:27 +00:00
Gaetan Craig-Riou
36b3b3c989 Switch to comparing product type semanticId 
Currently it's not possibel to compare two
`DataFoodConsortium::Connector::SKOSConcept` or
two `VirtualAssembly::Semantizer::SemanticObject with` `==`.

Related to : https://github.com/assemblee-virtuelle/semantizer-ruby/pull/2/files
 2024-01-22 11:40:50 +11:00
Maikel
a55587b765 Merge pull request #12059 from openfoodfoundation/dependabot/bundler/stripe-10.6.0 
Bump stripe from 10.5.0 to 10.6.0
 2024-01-22 10:29:31 +11:00
Maikel Linke
e25464b38a Re-record stripe API requests 2024-01-22 10:21:15 +11:00
Maikel
1f5541d2fb Merge pull request #12064 from dacook/bump-prettier-v4 
Bump prettier and pretty-quick
 2024-01-22 10:15:30 +11:00
Gaetan Craig-Riou
96a010033d Fix admin view to use dfc_id 
This was missed in a previous refactor
 2024-01-22 10:12:39 +11:00
Maikel Linke
28e17aff68 Fix DFC context in spec to resolve product types 
The `dfc-b:hasType` value can only be parsed as object id if the context
contains:

```
    "dfc-b:hasType":{
      "@type":"@id"
    },
```

The standard context includes this and it's easier to use. Now that the
URIs of product types are correctly resolved, we don't need to
substitute the URI manually.

Also dropped an old unneeded spec for backwards compatibility.
 2024-01-22 10:12:39 +11:00
Gaetan Craig-Riou
35da321e15 Fix skos parser to not replace Product type URI by dfc-pt 
The given productType.rdf file doesn't give us any context for `dfc-pt`,
so there was no reason to do that.
We still need to do some substitution in the importer, as some times
we are given `dfc-pt` as input data.
 2024-01-22 10:12:39 +11:00
Gaetan Craig-Riou
2aa0ab15b9 Simplify traversing of Product Types 2024-01-22 10:12:39 +11:00
Gaetan Craig-Riou
9607739e16 Per review, store product type instead of path 2024-01-22 10:12:39 +11:00
Gaetan Craig-Riou
c1e7aa6daa Small improvment for Importer 
Doesn't try to load skos concept if we are not dealing with an object
that doesn't refers to a skos concept
 2024-01-22 10:12:39 +11:00
Gaetan Craig-Riou
c40ccb8e86 Refactor, move product type matching to DfcProductTypeFactory 
It keeps SuppliedProductBuilder and move all the matching logic to its
own class
 2024-01-22 10:12:39 +11:00
Gaetan Craig-Riou
d8b56d5c16 Per review, match on the product type URI instead of name part 2 
For import this time
 2024-01-22 10:12:39 +11:00
Gaetan Craig-Riou
8013fac5b8 Per review, match on the product type URI instead of name 
Fox export only
 2024-01-22 10:12:39 +11:00