⬆️ Update Grocy to v3.2.0

[malcp]

Proposed Changes

Bumped Grocy version to v3.2.0. The addon was tested following the "Local Add-on Testing" in https://developers.home-assistant.io/docs/add-ons/testing/

Related Issues

• Upgrade Grocy to 3.2.0 #280
• closes Allow to set Catalan localization #282

[oli-f]

I just noticed that the fix_braindamage.patch patch fails due to this commit.

I have adapted and tested the patch:

diff --git a/views/layout/default.blade.php b/views/layout/default.blade.php
index 4eb3fb8d..d4e5e007 100644
--- a/views/layout/default.blade.php
+++ b/views/layout/default.blade.php
@@ -88,6 +88,10 @@
 		Grocy.Mode = '{{ GROCY_MODE }}';
 		Grocy.BaseUrl = '{{ $U('/') }}';
 		Grocy.CurrentUrlRelative = "/" + window.location.href.split('?')[0].replace(Grocy.BaseUrl, "");
+		if(Grocy.BaseUrl.indexOf('http') != 0 || Grocy.BaseUrl.indexOf('hassio_ingress') >= 0) {
+			Grocy.BaseUrl = window.location.origin + '{{ $U('/') }}';
+			Grocy.CurrentUrlRelative = "/" + window.location.pathname.replace(Grocy.BaseUrl, "");
+		};
 		Grocy.ActiveNav = '@yield('activeNav', '')';
 		Grocy.Currency = '{{ GROCY_CURRENCY }}';
 		Grocy.CalendarFirstDayOfWeek = '{{ GROCY_CALENDAR_FIRST_DAY_OF_WEEK }}';

[jlsjonas]

Is anything blocking this (besides @frenck's time)?

[frenck]

@jlsjonas working on the add-on as we speak...

[frenck]

This PR does contain multiple things that don't belong in a single PR. So it won't be merged though.

[jlsjonas]

Apart from the unfortunate commit message naming the diff feels quite in scope? (bumping grocy & fixing related items + patch-bumping used php8 modules as part of a general version bump feel quite related)

But your call ;) not my PR :)

[frenck]

@jlsjonas it isn't. It contains a bug fix, an Grocy upgrade, a dependency bump and support for a new feature.

I appreciate one tries to help, but PR should never have multiple concerns squashed together.

[jlsjonas]

Agreed and misconception on my end, I thought the patch fix was due to the version bump.
I do fail to see the new feature though (ca language? Didn't that come from the update?)

[malcp]

Sorry if I mixed things up. These were my reasons:

• The dependency bumps were required by Grocy v3.2.0, otherwise it wouldn't work.
• Catalan language was introduced in Grocy v3.2.0, so I thought it would make sense to enable it in this PR.
• There is no bug fix. Updating fix_braindamage.patch is needed because Grocy's codebase changed. Failing to do so would cause a regression.

[malcp]

I'm happy to modify/split this PR if that would unblock it from getting merged.

[frenck]

I've rebased the PR and pulled out the dependency upgrades that way.

Let's go ahead and merge the rest in one. In general, it's nice for someone to read "Catalan" was added as a language (or other changes that are made). Those will be hidden in a single upgrade message (which is not transparent).

[frenck]

(close/re-open was to re-trigger CI, GitHub was having some hickups earlier today)

[frenck]

Thanks, @malcp 👍

[malcp]

I've rebased the PR and pulled out the dependency upgrades that way.

Let's go ahead and merge the rest in one. In general, it's nice for someone to read "Catalan" was added as a language (or other changes that are made). Those will be hidden in a single upgrade message (which is not transparent).

Great! And fair point, I'll keep this in mind for next time.