Skip to content

[pull] develop from baserow:develop #195

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
pull merged 4 commits into from
Mar 6, 2026
Merged

[pull] develop from baserow:develop #195

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
9e43897
fix: resolve a core periodic minute interval bug (#4912)
picklepete Mar 6, 2026
b365ac2
chore(deps): bump tar from 7.5.9 to 7.5.10 in /web-frontend (#4932)
dependabot[bot] Mar 6, 2026
6dade4f
chore(deps): bump dompurify from 3.3.1 to 3.3.2 in /web-frontend (#4936)
dependabot[bot] Mar 6, 2026
ca6f29a
chore(deps): bump django from 5.2.11 to 5.2.12 in /backend (#4915)
dependabot[bot] Mar 6, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion backend/pyproject.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ dynamic = ["version"]
classifiers = []

dependencies = [
"django==5.2.11",
"django==5.2.12",
"django-cors-headers==4.9.0",
"djangorestframework==3.16.1",
"djangorestframework-simplejwt==5.5.1",
Expand Down
8 changes: 4 additions & 4 deletions backend/uv.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

9 changes: 9 additions & 0 deletions .../entries/unreleased/bug/resolved_a_bug_which_caused_the_periodic_trigger_to_reset_it.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
{
"type": "bug",
"message": "Resolved a bug which caused the periodic trigger to reset its minute value if the interval was set to minute.",
"issue_origin": "github",
"issue_number": null,
"domain": "automation",
"bullet_points": [],
"created_at": "2026-03-04"
}
12 changes: 8 additions & 4 deletions web-frontend/modules/integrations/core/components/services/CorePeriodicServiceForm.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -157,6 +157,7 @@ export default {
day_of_week: 0, // Monday=0..Sunday=6 (LOCAL)
day_of_month: 1, // 1..31 (LOCAL)
},
syncedFromValues: false, // Have we synced these from `values` yet?
}
},
computed: {
Expand Down Expand Up @@ -259,23 +260,26 @@ export default {
'user.day_of_week': 'syncValuesFromUser',
'user.day_of_month': 'syncValuesFromUser',
'values.interval'(newInterval, oldInterval) {
// When we change *to* MINUTE, we default to the minimum frequency
// that is granted to this Baserow instance type.
// When we change *from* MINUTE, reset minute to 0.
if (
this.user.minute === 0 &&
this.syncedFromValues &&
newInterval === 'MINUTE' &&
oldInterval !== 'MINUTE'
) {
// Once `syncedFromValues` is true (which happens after the initial sync in
// mounted()), if the user changes the interval *to* MINUTE, we want to set the
// minute field to the minimum allowed frequency for this Baserow instance type.
this.user.minute = this.minimumMinuteFrequency
} else if (newInterval !== 'MINUTE' && oldInterval === 'MINUTE') {
// Otherwise if we're changing *from* MINUTE, then reset the `minute` to 0.
this.user.minute = 0
}
this.syncValuesFromUser()
},
},
mounted() {
this.syncUserFromValues()
// We've fully synced the user facing values.
this.syncedFromValues = true
},
methods: {
fieldHasErrors(name) {
Expand Down
12 changes: 6 additions & 6 deletions web-frontend/yarn.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5904,9 +5904,9 @@ domhandler@^5.0.2, domhandler@^5.0.3:
domelementtype "^2.3.0"

dompurify@^3.3.1:
version "3.3.1"
resolved "https://registry.yarnpkg.com/dompurify/-/dompurify-3.3.1.tgz#c7e1ddebfe3301eacd6c0c12a4af284936dbbb86"
integrity sha512-qkdCKzLNtrgPFP1Vo+98FRzJnBRGe4ffyCea9IwHB1fyxPOeNTHpLKYGd4Uk9xvNoH0ZoOjwZxNptyMwqrId1Q==
version "3.3.2"
resolved "https://registry.yarnpkg.com/dompurify/-/dompurify-3.3.2.tgz#58c515d0f8508b8749452a028aa589ad80b36325"
integrity sha512-6obghkliLdmKa56xdbLOpUZ43pAR6xFy1uOrxBaIDjT+yaRuuybLjGS9eVBoSR/UPU5fq3OXClEHLJNGvbxKpQ==
optionalDependencies:
"@types/trusted-types" "^2.0.7"

Expand Down Expand Up @@ -10852,9 +10852,9 @@ tar-stream@^3.0.0:
streamx "^2.15.0"

tar@^7.4.0:
version "7.5.9"
resolved "https://registry.yarnpkg.com/tar/-/tar-7.5.9.tgz#817ac12a54bc4362c51340875b8985d7dc9724b8"
integrity sha512-BTLcK0xsDh2+PUe9F6c2TlRp4zOOBMTkoQHQIWSIzI0R7KG46uEwq4OPk2W7bZcprBMsuaeFsqwYr7pjh6CuHg==
version "7.5.10"
resolved "https://registry.yarnpkg.com/tar/-/tar-7.5.10.tgz#2281541123f5507db38bc6eb22619f4bbaef73ad"
integrity sha512-8mOPs1//5q/rlkNSPcCegA6hiHJYDmSLEI8aMH/CdSQJNWztHC9WHNam5zdQlfpTwB9Xp7IBEsHfV5LKMJGVAw==
dependencies:
"@isaacs/fs-minipass" "^4.0.0"
chownr "^3.0.0"
Expand Down
Loading