raggedstaff/openfoodnetwork
1
0
Fork 0
mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-03-16 04:24:23 +00:00
Code Issues Packages Projects Releases Wiki Activity
29,797 Commits 15 Branches 457 Tags
4de40e817fbe83044cad12deafc577ba35a124ae
Commit Graph

15563 Commits

Author SHA1 Message Date
David Cook
4de40e817f Left-align navigation menu 
It looks really wierd when there's only a few items.
 2023-12-06 12:54:04 +11:00
David Cook
3760cd93b9 Enable brower-default outlines on links 
This code was from Spree. Unless you have good focus/active styles for all links, the outline is very helpful for accessibility.
Most websites these days add nice thick outlines, which might be worth considering in the future.
 2023-12-06 12:54:01 +11:00
David Cook
300998acb6 Merge pull request #11811 from dacook/buu-stock-levels-11062 
[BUU] Stock level popout
 2023-12-05 13:56:01 +11:00
David Cook
685a1955bc Merge pull request #11872 from mkllnk/activate-background-reports 
Activate background report processing by default
 2023-12-05 12:04:19 +11:00
Filipe
f94d2c386c Merge pull request #11863 from abdellani/11862-fix-product-shoud-not-be-priceless 
product should not be priceless
 2023-12-01 10:43:30 +00:00
Maikel Linke
bbe37e1392 Update ReportsController for background reports 
As it turns out, the background reports were missing a small feature to
store user preferences. Yay specs!
 2023-12-01 15:21:42 +11:00
Gaetan Craig-Riou
082f78c772 Merge pull request #11873 from dacook/viewcomponent-sidecar 
ViewComponent sidecar
 2023-12-01 10:44:13 +11:00
David Cook
58215727bc [fixup] 
- Style/ClassAndModuleChildren: Use nested module/class definitions instead of compact style.
- fix spec
 2023-11-30 13:47:39 +11:00
David Cook
2013750732 Rename files to match recommended naming scheme 
This naming scheme removes some duplication which is nice, but it's a little strange and results in a longer name overall. I don't like it very much because:
- filenames don't include the component's actual name. This makes it slightly harder to find them in my text editor (but I'd probably get used to that)
- the namespace and class naming isn't exactly right. This is _the_ vertical_ellipsis_menu, not a subcomponent.
- the stimulus controller name is now longer, adding more cruft to the HTML.

Lots of discussion here: https://github.com/ViewComponent/view_component/discussions/67
People tried to come up with a better way (and I was tempted to try myself). It seems this approach won. I guess it's not so bad if your component names are shorter.
 2023-11-30 12:25:18 +11:00
David Cook
f6d72127a7 Move controller to sidecar directory 2023-11-30 12:18:55 +11:00
David Cook
ed93c77578 Load Stimulus controllers from 'sidecar' directories 
Javascript files can now be included in the component directory, alongside HTML and CSS.

As per https://viewcomponent.org/guide/javascript_and_css.html
 2023-11-30 12:18:55 +11:00
David Cook
6bf418c4eb Fixup 2023-11-29 15:36:00 +11:00
David Cook
ccc0c17e04 Hide value of disabled input in popout 
I'm not sure if we want to do this on all fields, so just scoped it here for now.
 2023-11-29 15:36:00 +11:00
David Cook
9ce511f69d Update disabled field style 2023-11-29 15:35:59 +11:00
David Cook
aa792346fc Refactor 2023-11-29 15:18:23 +11:00
Mohamed ABDELLANI
9ce62cf6af replace link_to with contant_tag 2023-11-28 15:02:03 +01:00
Mohamed ABDELLANI
a13e087541 use render edit instead of redirect_to 
with redirect_to, the validation errors will be lost at the rendering time.
 2023-11-28 13:45:17 +01:00
Mohamed ABDELLANI
a0c2facca4 validate price numericality on product and variants 2023-11-28 13:45:08 +01:00
Konrad
d4cebfdb4f Merge pull request #11837 from binarygit/open-link-in-new-page 
Open external link in product description inside new page
 2023-11-28 11:09:35 +01:00
David Cook
f034e46aed Fix label 
Strangely, the spec passed when run locally, but not in CI. It's a curious case of the wrong letter case.
 2023-11-28 10:44:34 +11:00
David Cook
bc6a83017b Update spec 
Ok that was an afterthought, but better late than never.
 2023-11-28 10:44:34 +11:00
David Cook
373743f96d Simplify event handlers 
The new 'input' event is for this exact use case.
 2023-11-28 10:44:34 +11:00
David Cook
88fe8dcbe0 Show changes on popout button 2023-11-28 10:44:34 +11:00
David Cook
5e96368c85 Count changed checkboxes 2023-11-28 10:44:34 +11:00
David Cook
69f160ff95 Toggle input disabled when on demand checked 
This introduces a new 'toggle' controller, and we already had three\! So I created a generic interface that could be extended to potentially support all of them. I propose we try to reduce them all into the one controller, but won't go down the rabbit-hole just yet..

I have an idea on how to re-arrange and make it more contained, by assigning the controller only to the checkbox, and defining targets with aria-controls="", but chose to stick with Stimulus conventions for now.
 2023-11-28 10:44:34 +11:00
David Cook
9bc1e873d3 Display summary of the popout values 
I couldn't think of a simpler way to hardcode it, so now we have a clever generic method :)

We can assume that hidden elements will stay hidden, but we need to check each time if an element is disabled or not.
 2023-11-28 10:44:34 +11:00
David Cook
b6045655ee Hide popout when checkbox is checked 2023-11-28 10:44:34 +11:00
David Cook
78d2ddb9b7 Close popout when focus outside 
I'm starting to think that these stimulus tests are worthless. The environment is not the same as a browser, which creates extra work to deal with the inconsistencies. And it means we're not testing real world behaviour.

So these are just unit tests, but they take extra effort to put together due to the inter-relatedness with the DOM. Hmm.
 2023-11-28 10:44:34 +11:00
David Cook
4560e3728c Show popout on click or down key 
It looks like a select drop-down, so it can behave like one too.
 2023-11-28 10:44:34 +11:00
David Cook
735b5789cc [wip] Style on-hand button 
Had to update the form controller a little bit to handle buttons.

But arrow not showwing on focus.
Getting some weird SCSS behaviour here.. maybe I'm trying to be too clever.
 2023-11-28 10:44:34 +11:00
David Cook
d218565834 Style stock popout 2023-11-28 10:44:34 +11:00
David Cook
d9570cdf32 Update v3 checkbox style 
This doesn't _quite_ match the design, but would require a big CSS hack to customise it further, so I thought let's start with this.
 2023-11-28 10:44:34 +11:00
David Cook
b7ac1f2696 Move specific style rule to where it belongs 
Also fixed it to line up properly. There's probably a better way to line it up but that's no my concern right now..
 2023-11-28 10:44:34 +11:00
David Cook
eccfe96a5b Use form hash structure 
The array format is generally fine, but to properly support checkboxes, we need this format with hash keys.
https://guides.rubyonrails.org/form_helpers.html#understanding-parameter-naming-conventions
 2023-11-28 10:44:34 +11:00
David Cook
55cd8a6773 Add on_demand field 
But 'Array parameters do not play well with the check_box helper.'

...
 2023-11-28 10:43:10 +11:00
David Cook
7aefa834bf Add on_hand input 2023-11-28 10:43:10 +11:00
David Cook
4d22123e02 Remove stock level from product row 
It creates the false impression we can handle agregated stock.
 2023-11-28 10:43:10 +11:00
David Cook
d989b8ad2f Remove unnecessary partial 
Yay, now it's compact enough to fit in the table partial.

(Although we should probably try to reduce that one down one day..)
 2023-11-24 16:28:00 +11:00
David Cook
968a224da6 Move vertical ellipsis menu to a ViewComponent 
Javascript hasn't been moved in, as we don't seem to be set up for that yet.

We could make it smarter, and pass in an array of parameters to build the links (as in _order_links.html.haml). But why make it complicated if we don't need to?
 2023-11-24 16:23:18 +11:00
David Cook
2bd2bea7b7 Remove need for class 
Generally, I would say that style rules should have a BEM-style class name, but in this case it's terribly convenient to support a tags directly.
 2023-11-24 16:14:28 +11:00
Rachel Arnould
1088b6b6dd Merge pull request #11785 from chahmedejaz/task/11067-admin_style_v3-product-clone 
Implement product clone
 2023-11-22 16:29:38 +01:00
Yasir Azgar
72089d8213 11612 - pass date args 
fix typo
 2023-11-21 11:15:52 +01:00
binarygit
208cad959a Open external link in product description inside new page 2023-11-21 13:33:48 +05:45
Filipe
ebd1151054 Merge pull request #11730 from murjax/payment-save-flash-9048 
Fix Stripe payment flash rendering issue
 2023-11-17 11:51:42 +00:00
Filipe
e6e4e014dc Merge pull request #11731 from chahmedejaz/bugfix/11667-clone-tags-issue-for-OC 
Fix Cloning Tags Issue for OrderCycle
 2023-11-17 10:50:33 +00:00
Filipe
c9084db933 Merge pull request #11761 from binarygit/open-external-links-in-new-page 
Open external links in product description in a new page
 2023-11-17 10:30:03 +00:00
Neal Chambers
c3c4486d0c Safely autocorrect Style/RedundantStringEscape 
Inspecting 1513 files
..........................................................................................................................................................................................................................................................................................................................C...........................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................C......................................................................................................................................................................................................................................................................................................................................................................................................................................................................C...........................................................................................................

Offenses:

app/models/spree/calculator.rb:31:48: C: [Corrected] Style/RedundantStringEscape: Redundant escape of / inside string literal.
      self.class.name.titleize.gsub("Calculator\/", "")
                                               ^^
spec/controllers/spree/admin/shipping_methods_controller_spec.rb:40:78: C: [Corrected] Style/RedundantStringEscape: Redundant escape of ' inside string literal.
        params[:shipping_method][:calculator_attributes][shipping_amount] = "\'20.0'"
                                                                             ^^
spec/system/admin/enterprise_fees_spec.rb:82:78: C: [Corrected] Style/RedundantStringEscape: Redundant escape of ' inside string literal.
    fill_in("#{prefix}_calculator_attributes_preferred_flat_percent", with: "\'20.0'")
                                                                             ^^
spec/system/admin/enterprise_fees_spec.rb:140:42: C: [Corrected] Style/RedundantStringEscape: Redundant escape of ' inside string literal.
        'preferred_flat_percent', with: "\'20.0'"
                                         ^^

1513 files inspected, 4 offenses detected, 4 offenses corrected
 2023-11-17 09:03:32 +09:00
Neal Chambers
edbf4c15a9 Safely autocorrect Style/RedundantReturn 
Inspecting 1513 files
.........................................................................................................................................................................................................................................................................................................C......................................................C............................................................................................................................................................................................................................................................................................................................................................................................................................................C.........................................................C.......C.........................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................

Offenses:

app/models/product_import/entry_validator.rb:200:7: C: [Corrected] Style/RedundantReturn: Redundant return detected.
      return true unless Float(value, exception: false).nil?
      ^^^^^^
app/models/spree/stock/availability_validator.rb:30:9: C: [Corrected] Layout/EmptyLineAfterGuardClause: Add empty line after guard clause.
        return line_item.target_shipment if line_item.target_shipment
        ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
app/models/spree/stock/availability_validator.rb:31:9: C: [Corrected] Style/RedundantReturn: Redundant return detected.
        return line_item.order.shipments.first if line_item.order&.shipments&.any?
        ^^^^^^
lib/reporting/reports/enterprise_fee_summary/summarizer.rb:41:11: C: [Corrected] Layout/EmptyLineAfterGuardClause: Add empty line after guard clause.
          return DataRepresentations::IncomingExchangeLineItemFee if for_incoming_exchange?
          ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
lib/reporting/reports/enterprise_fee_summary/summarizer.rb:42:11: C: [Corrected] Style/RedundantReturn: Redundant return detected.
          return DataRepresentations::OutgoingExchangeLineItemFee if for_outgoing_exchange?
          ^^^^^^
lib/stripe/authorize_response_patcher.rb:31:7: C: [Corrected] Style/RedundantReturn: Redundant return detected.
      return url if url.match(%r{https?://\S+}) && url.include?("stripe.com")
      ^^^^^^
lib/tasks/data.rake:99:7: C: [Corrected] Style/RedundantReturn: Redundant return detected.
      return true if Integer(value)
      ^^^^^^

1513 files inspected, 7 offenses detected, 7 offenses corrected
 2023-11-17 09:00:50 +09:00
Neal Chambers
85fef7ac4b Safely autocorrect Style/RedundantRegexpArgument 
Inspecting 1513 files
...........................................................................................................................................................................................................................................................................................................................................................C....................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................C........................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................

Offenses:

app/models/spree/shipping_method.rb:69:25: C: [Corrected] Style/RedundantRegexpArgument: Use string ":tracking" as argument instead of regexp /:tracking/.
      tracking_url.gsub(/:tracking/, tracking) unless tracking.blank? || tracking_url.blank?
                        ^^^^^^^^^^^
lib/spree/i18n.rb:36:17: C: [Corrected] Style/RedundantRegexpArgument: Use string "spree" as argument instead of regexp /spree/.
      path.gsub(/spree/, '')
                ^^^^^^^

1513 files inspected, 2 offenses detected, 2 offenses corrected
 2023-11-17 08:59:27 +09:00
Ahmed Ejaz
29eadedc3a Merge branch 'master' into task/11067-admin_style_v3-product-clone 2023-11-17 03:45:54 +05:00