diff --git a/backend/pyproject.toml b/backend/pyproject.toml index c83531784d..e678acdb4b 100644 --- a/backend/pyproject.toml +++ b/backend/pyproject.toml @@ -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", diff --git a/backend/uv.lock b/backend/uv.lock index 01b4f3c777..89c1c97a6c 100644 --- a/backend/uv.lock +++ b/backend/uv.lock @@ -335,7 +335,7 @@ requires-dist = [ { name = "channels", extras = ["daphne"], specifier = "==4.3.2" }, { name = "channels-redis", specifier = "==4.3.0" }, { name = "dj-database-url", specifier = "==3.1.0" }, - { name = "django", specifier = "==5.2.11" }, + { name = "django", specifier = "==5.2.12" }, { name = "django-cachalot", specifier = "==2.8.0" }, { name = "django-celery-beat", specifier = "==2.8.1" }, { name = "django-celery-email-reboot", specifier = "==4.2.0" }, @@ -896,15 +896,15 @@ wheels = [ [[package]] name = "django" -version = "5.2.11" +version = "5.2.12" source = { registry = "https://pypi.org/simple" } dependencies = [ { name = "asgiref", marker = "sys_platform == 'darwin' or sys_platform == 'linux'" }, { name = "sqlparse", marker = "sys_platform == 'darwin' or sys_platform == 'linux'" }, ] -sdist = { url = "https://files.pythonhosted.org/packages/17/f2/3e57ef696b95067e05ae206171e47a8e53b9c84eec56198671ef9eaa51a6/django-5.2.11.tar.gz", hash = "sha256:7f2d292ad8b9ee35e405d965fbbad293758b858c34bbf7f3df551aeeac6f02d3", size = 10885017, upload-time = "2026-02-03T13:52:50.554Z" } +sdist = { url = "https://files.pythonhosted.org/packages/bd/55/b9445fc0695b03746f355c05b2eecc54c34e05198c686f4fc4406b722b52/django-5.2.12.tar.gz", hash = "sha256:6b809af7165c73eff5ce1c87fdae75d4da6520d6667f86401ecf55b681eb1eeb", size = 10860574, upload-time = "2026-03-03T13:56:05.509Z" } wheels = [ - { url = "https://files.pythonhosted.org/packages/91/a7/2b112ab430575bf3135b8304ac372248500d99c352f777485f53fdb9537e/django-5.2.11-py3-none-any.whl", hash = "sha256:e7130df33ada9ab5e5e929bc19346a20fe383f5454acb2cc004508f242ee92c0", size = 8291375, upload-time = "2026-02-03T13:52:42.47Z" }, + { url = "https://files.pythonhosted.org/packages/4e/32/4b144e125678efccf5d5b61581de1c4088d6b0286e46096e3b8de0d556c8/django-5.2.12-py3-none-any.whl", hash = "sha256:4853482f395c3a151937f6991272540fcbf531464f254a347bf7c89f53c8cff7", size = 8310245, upload-time = "2026-03-03T13:56:01.174Z" }, ] [[package]] diff --git a/changelog/entries/unreleased/bug/resolved_a_bug_which_caused_the_periodic_trigger_to_reset_it.json b/changelog/entries/unreleased/bug/resolved_a_bug_which_caused_the_periodic_trigger_to_reset_it.json new file mode 100644 index 0000000000..a995d47c80 --- /dev/null +++ b/changelog/entries/unreleased/bug/resolved_a_bug_which_caused_the_periodic_trigger_to_reset_it.json @@ -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" +} \ No newline at end of file diff --git a/web-frontend/modules/integrations/core/components/services/CorePeriodicServiceForm.vue b/web-frontend/modules/integrations/core/components/services/CorePeriodicServiceForm.vue index 05962b8baa..db26397c27 100644 --- a/web-frontend/modules/integrations/core/components/services/CorePeriodicServiceForm.vue +++ b/web-frontend/modules/integrations/core/components/services/CorePeriodicServiceForm.vue @@ -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: { @@ -259,16 +260,17 @@ 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() @@ -276,6 +278,8 @@ export default { }, mounted() { this.syncUserFromValues() + // We've fully synced the user facing values. + this.syncedFromValues = true }, methods: { fieldHasErrors(name) { diff --git a/web-frontend/yarn.lock b/web-frontend/yarn.lock index 675f1a885f..dcf0f1536b 100644 --- a/web-frontend/yarn.lock +++ b/web-frontend/yarn.lock @@ -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" @@ -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"