raggedstaff/openfoodnetwork
1
0
Fork 0
mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-02-07 22:46:06 +00:00
Code Issues Packages Projects Releases Wiki Activity
34,725 Commits 18 Branches 453 Tags
d0f48687e28e7094de4580e6e04691cb2a0799ec
Commit Graph

34725 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jean-Baptiste Bellet
643897abb2 Add search functionnality 2023-07-19 14:58:39 +02:00
Jean-Baptiste Bellet
c786f300ca Have a tiny url state management by using replace_state of cable_ready 2023-07-19 14:58:39 +02:00
Jean-Baptiste Bellet
0fd4d892d9 This is now unused: through the js controller only at startup 2023-07-19 14:58:39 +02:00
Jean-Baptiste Bellet
3da6e02192 Call pagination via perPage param: no state to manage, use param 2023-07-19 14:58:39 +02:00
Jean-Baptiste Bellet
61d1f30e04 Rename productsV3 to products: avoid upper|lower case issues 
This is causing some issues, misunderstandings around case.

Therefore, directly use the Reflex, and lifecycle methods `beforeFetch` and `afterFetch` are called, even if we use the Reflex (and not the js controller methods). This is pretty handy.

+ adds some id to pagination element (https://docs.stimulusreflex.com/guide/reflexes.html#declaring-a-reflex-in-html-with-data-attributes)

Global documentation: https://docs.stimulusreflex.com/guide/reflexes.html
 2023-07-19 14:58:39 +02:00
Jean-Baptiste Bellet
574adb88d2 Add a per page component 
This is still a WIP.
 2023-07-19 14:58:39 +02:00
Jean-Baptiste Bellet
0b83dc088d Separation of concerns: use a loading controller 
Two different events can be used: `show-loading` and `hide-loading`.

I'm not 100% sure this is the right way to go, but let's try!
 2023-07-19 14:58:39 +02:00
Jean-Baptiste Bellet
5aebbe4102 use beforeFetch and afterFetch lifecycle methods 
+ Move outside `Admin` module the reflex

Therefore, this reflex should be _equivalent_ to its javascript controller: `ProductsV3` (relation is made through names)

Remove unwanted line

Actually call StimulusJS controller instead of calling the reflex itself

In order to have this "showLoading", "hideLoading" behavior.

It seems to be possible to directly use the Reflex itself (use `data-reflex` instead of `data-action`) but I can't make it work: the `stimulus-controller:after` event is never broadcasted/catched (but `stimulus-controller:before` yes...)

Documentation:
https://docs.stimulusreflex.com/guide/reflexes.html#understanding-stimulusreflex-controllers
https://docs.stimulusreflex.com/guide/lifecycle.html#generic-life-cycle-methods

Maybe @dacook if you want to have a look...
 2023-07-19 14:58:39 +02:00
Jean-Baptiste Bellet
3b61508652 Be more specific to only apply to the first container, ie. the root one 
+ Override default position (relative) in order to have loading above
 2023-07-19 14:58:39 +02:00
Jean-Baptiste Bellet
47f21cb59e Add pagination with pagy 
For `admin_style_v3` use `<` and `>` for next and previous link

instead of `next` and `previous` string

Extract a mixin for a default box-shadow

Maybe this needs to be redefined. Let's see how next things goes.

When a table is followed by a pagination, remove its margin-bottom + border

Finally, design the pagination component

Add sorting/pagination module, on top of table

We use `cablea_ready.replace`, so need to add `#products-content` id

Use a `pagy` partial with reflex action, instead of the legacy one

- revert the legacy one to its previous state
 - in reflex, fetch product with page attribute, 1 by default

Move `pagy` into `admin/shared/v3/` to be reusable

+ use fontawesome icons for next and previous page

Remove useless line
 2023-07-19 14:58:39 +02:00
Jean-Baptiste Bellet
69cff85577 Change color to EFF1F2 2023-07-19 14:58:39 +02:00
Jean-Baptiste Bellet
9b92c25879 Add a section for specific rules for both admin-menu and sub-menu 
+ change height for border bottom on selected/hovered menu
 2023-07-19 14:58:39 +02:00
Jean-Baptiste Bellet
9762819aa8 Use the right color 2023-07-19 14:58:39 +02:00
Jean-Baptiste Bellet
1f3d41972f Add same padding than #admin-menu,#sub-menu li a in order to align 
content (header, navigation, content) on both left and right
 2023-07-19 14:58:39 +02:00
Jean-Baptiste Bellet
2892301336 Factorize menu and submenu into same definition 
as they are the same, expect the font-size
 2023-07-19 14:58:39 +02:00
Jean-Baptiste Bellet
24c045a09c Reduce padding 2023-07-19 14:58:39 +02:00
Jean-Baptiste Bellet
a8088ae231 Create a pseudo element to add a line under the menu item 
- Increase top menu underline height to 3px
 - reduce underline width to same width of label
 2023-07-19 14:58:39 +02:00
Konrad
d99ac35824 Merge pull request #11105 from jibees/11098-summary-step-order-details-line-break-on-currency-symbol-and-lettering 
Checkout summary: avoid carriage return on price
 2023-07-19 13:00:08 +02:00
Filipe
91e2e447c0 Merge pull request #11175 from jibees/11171-checkout-step-3-delivery-details-are-showing-bill-address-instead-of-delivery-address 
Checkout, Summary step: Display the ship/delivery address (instead of the billing one)
 2023-07-19 11:36:19 +01:00
Filipe
843bcaa500 Merge pull request #11184 from rioug/11183-fix-delete-voucher-tax-excl-price 
[vouchers] fix delete voucher when tax excluded from price
 2023-07-19 11:24:25 +01:00
dependabot[bot]
314c02a92b chore(deps-dev): bump knapsack_pro from 5.2.0 to 5.3.0 
Bumps [knapsack_pro](https://github.com/KnapsackPro/knapsack_pro-ruby) from 5.2.0 to 5.3.0.
- [Changelog](https://github.com/KnapsackPro/knapsack_pro-ruby/blob/master/CHANGELOG.md)
- [Commits](https://github.com/KnapsackPro/knapsack_pro-ruby/compare/v5.2.0...v5.3.0)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2023-07-19 09:31:24 +00:00
dependabot[bot]
6c323c82d5 chore(deps): bump mini_portile2 from 2.8.2 to 2.8.4 
Bumps [mini_portile2](https://github.com/flavorjones/mini_portile) from 2.8.2 to 2.8.4.
- [Release notes](https://github.com/flavorjones/mini_portile/releases)
- [Changelog](https://github.com/flavorjones/mini_portile/blob/main/CHANGELOG.md)
- [Commits](https://github.com/flavorjones/mini_portile/compare/v2.8.2...v2.8.4)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2023-07-19 09:27:32 +00:00
Jean-Baptiste Bellet
731fb3c0b3 Update cable_ready and stimulus_reflex as well 
In order to reflect the one used in package.json
 2023-07-19 09:05:31 +02:00
dependabot[bot]
385f3964ad chore(deps): bump stimulus_reflex from 3.5.0-rc2 to 3.5.0-rc3 
Bumps [stimulus_reflex](https://github.com/stimulusreflex/stimulus_reflex) from 3.5.0-rc2 to 3.5.0-rc3.
- [Release notes](https://github.com/stimulusreflex/stimulus_reflex/releases)
- [Changelog](https://github.com/stimulusreflex/stimulus_reflex/blob/main/CHANGELOG.md)
- [Commits](https://github.com/stimulusreflex/stimulus_reflex/commits)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2023-07-19 09:05:31 +02:00
jibees
8475a31ebb Merge pull request #11228 from openfoodfoundation/dependabot/npm_and_yarn/word-wrap-1.2.4 
chore(deps): bump word-wrap from 1.2.3 to 1.2.4
 2023-07-19 08:51:34 +02:00
dependabot[bot]
dd7e6d1a19 chore(deps): bump word-wrap from 1.2.3 to 1.2.4 
Bumps [word-wrap](https://github.com/jonschlinkert/word-wrap) from 1.2.3 to 1.2.4.
- [Release notes](https://github.com/jonschlinkert/word-wrap/releases)
- [Commits](https://github.com/jonschlinkert/word-wrap/compare/1.2.3...1.2.4)

---
updated-dependencies:
- dependency-name: word-wrap
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
 2023-07-19 02:14:43 +00:00
Neal Chambers
c1095c3616 Update .rubocop_todo.yml 2023-07-19 08:43:36 +09:00
Neal Chambers
728926cc9a Fix Layout/LineLength 2023-07-19 08:39:26 +09:00
Filipe
40db81f056 Merge pull request #11150 from macanudo527/fix_admin_class_size 
Fix Metrics/ClassSize
 2023-07-18 19:10:03 +01:00
Filipe
15282f9738 Merge pull request #11115 from abdellani/fix-enterprise-users-should-have-access-to-invoices 
authorize enterprise users to access invoices page
 2023-07-18 16:42:00 +01:00
jibees
11b2d911d2 Merge pull request #11217 from openfoodfoundation/dependabot/bundler/rubocop-1.54.2 
chore(deps-dev): bump rubocop from 1.54.1 to 1.54.2
 2023-07-18 17:31:17 +02:00
jibees
bbdeb0c9ab Merge pull request #11213 from openfoodfoundation/dependabot/bundler/rswag-specs-2.10.1 
chore(deps-dev): bump rswag-specs from 2.9.0 to 2.10.1
 2023-07-18 17:29:37 +02:00
jibees
4e29fcba64 Merge pull request #11210 from openfoodfoundation/dependabot/npm_and_yarn/floating-ui/dom-1.4.5 
chore(deps): bump @floating-ui/dom from 1.4.4 to 1.4.5
 2023-07-18 17:14:41 +02:00
dependabot[bot]
a975b78816 chore(deps-dev): bump rubocop from 1.54.1 to 1.54.2 
Bumps [rubocop](https://github.com/rubocop/rubocop) from 1.54.1 to 1.54.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.54.1...v1.54.2)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2023-07-18 15:08:00 +00:00
dependabot[bot]
02b1c6dd2d chore(deps-dev): bump rswag-specs from 2.9.0 to 2.10.1 
Bumps [rswag-specs](https://github.com/rswag/rswag) from 2.9.0 to 2.10.1.
- [Release notes](https://github.com/rswag/rswag/releases)
- [Changelog](https://github.com/rswag/rswag/blob/master/CHANGELOG.md)
- [Commits](https://github.com/rswag/rswag/compare/2.9.0...2.10.1)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2023-07-18 15:07:21 +00:00
jibees
af365c6b79 Merge pull request #11215 from openfoodfoundation/dependabot/bundler/rswag-api-2.10.1 
chore(deps): bump rswag-api from 2.9.0 to 2.10.1
 2023-07-18 17:06:07 +02:00
jibees
f054b74c7d Merge pull request #11216 from openfoodfoundation/dependabot/bundler/rswag-ui-2.10.1 
chore(deps): bump rswag-ui from 2.9.0 to 2.10.1
 2023-07-18 17:05:15 +02:00
Filipe
adc5692bc5 Merge pull request #11182 from filipefurtad0/profile_change_spec 
Adds spec for profile change
 2023-07-18 16:02:39 +01:00
jibees
1d03f7a009 Merge pull request #11224 from openfoodfoundation/dependabot/bundler/knapsack_pro-5.2.0 
chore(deps-dev): bump knapsack_pro from 5.1.2 to 5.2.0
 2023-07-18 16:30:45 +02:00
dependabot[bot]
74f8f9dd52 chore(deps): bump rswag-api from 2.9.0 to 2.10.1 
Bumps [rswag-api](https://github.com/rswag/rswag) from 2.9.0 to 2.10.1.
- [Release notes](https://github.com/rswag/rswag/releases)
- [Changelog](https://github.com/rswag/rswag/blob/master/CHANGELOG.md)
- [Commits](https://github.com/rswag/rswag/compare/2.9.0...2.10.1)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2023-07-18 14:28:58 +00:00
dependabot[bot]
dae690ae5c chore(deps): bump rswag-ui from 2.9.0 to 2.10.1 
Bumps [rswag-ui](https://github.com/rswag/rswag) from 2.9.0 to 2.10.1.
- [Release notes](https://github.com/rswag/rswag/releases)
- [Changelog](https://github.com/rswag/rswag/blob/master/CHANGELOG.md)
- [Commits](https://github.com/rswag/rswag/compare/2.9.0...2.10.1)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2023-07-18 14:28:55 +00:00
dependabot[bot]
53b1188a43 chore(deps): bump @floating-ui/dom from 1.4.4 to 1.4.5 
Bumps [@floating-ui/dom](https://github.com/floating-ui/floating-ui/tree/HEAD/packages/dom) from 1.4.4 to 1.4.5.
- [Release notes](https://github.com/floating-ui/floating-ui/releases)
- [Commits](https://github.com/floating-ui/floating-ui/commits/@floating-ui/dom@1.4.5/packages/dom)

---
updated-dependencies:
- dependency-name: "@floating-ui/dom"
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
 2023-07-18 14:28:47 +00:00
dependabot[bot]
6c02e1c05d chore(deps-dev): bump knapsack_pro from 5.1.2 to 5.2.0 
Bumps [knapsack_pro](https://github.com/KnapsackPro/knapsack_pro-ruby) from 5.1.2 to 5.2.0.
- [Changelog](https://github.com/KnapsackPro/knapsack_pro-ruby/blob/master/CHANGELOG.md)
- [Commits](https://github.com/KnapsackPro/knapsack_pro-ruby/compare/v5.1.2...v5.2.0)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2023-07-18 09:18:55 +00:00
Gaetan Craig-Riou
a5b2bc6293 Per review, Refactor VoucherAdjustmentsService 
Change #calculate to #update and clean up internal code
 2023-07-18 15:16:21 +10:00
Gaetan Craig-Riou
a584f9aaec Refactor VoucherAdjustmentsService 
It's more inline with existing coding style
 2023-07-18 14:39:01 +10:00
David Cook
46b27b2d9d Number release steps 
There are three distinct parts to the process, so I thought it worth giving them an identifying number.
 2023-07-18 09:34:28 +10:00
Neal Chambers
8fc0a20249 Add Additional Test for Model Creation 2023-07-18 08:17:34 +09:00
Neal Chambers
ba862bc4b7 Add tests for Enterprise Fees Bulk Update 2023-07-18 08:17:34 +09:00
Neal Chambers
186d7a2f54 Move and Rename BulkUpdateForm 2023-07-18 08:17:34 +09:00
David Cook
9b16c1171f Remove redundant returns 
The return value of active record validations doesn't actually do anything. A record is 'valid?' if @errors is empty.
 2023-07-18 08:17:34 +09:00