FIX: update duration & interval when input values updated. #26796
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Previously, we only updated the duration and interval values in the constructor. So whenever the initial values are updated in the form the changes are not reflected in the UI. To fix this issue we're using "get" methods in this PR.
CvX
reviewed
May 6, 2024
Comment on lines
11
to
12
| const category = fixturesByUrl["/c/11/show.json"].category; | ||
| category.permissions = []; |
There was a problem hiding this comment.
We've got a leak! 🪣💧
(gotta wrap the category in a cloneJSON())
app/assets/javascripts/discourse/tests/acceptance/category-edit-settings-test.js
Outdated
Show resolved
Hide resolved
app/assets/javascripts/discourse/tests/acceptance/category-edit-settings-test.js
Outdated
Show resolved
Hide resolved
app/assets/javascripts/discourse/app/components/relative-time-picker.gjs
Outdated
Show resolved
Hide resolved
Comment on lines
50
to
65
| _intervalFromHours() { | ||
| let interval; | ||
| if (this.args.durationHours === null) { | ||
| this.duration = this.args.durationHours; | ||
| this.selectedInterval = "hours"; | ||
| interval = "hours"; | ||
| } else if (this.args.durationHours >= 8760) { | ||
| this.duration = this._roundedDuration(this.args.durationHours / 365 / 24); | ||
| this.selectedInterval = "years"; | ||
| interval = "years"; | ||
| } else if (this.args.durationHours >= 730) { | ||
| this.duration = this._roundedDuration(this.args.durationHours / 30 / 24); | ||
| this.selectedInterval = "months"; | ||
| interval = "months"; | ||
| } else if (this.args.durationHours >= 24) { | ||
| this.duration = this._roundedDuration(this.args.durationHours / 24); | ||
| this.selectedInterval = "days"; | ||
| interval = "days"; | ||
| } else if (this.args.durationHours < 1) { | ||
| this.duration = this._roundedDuration(this.args.durationHours * 60); | ||
| this.selectedInterval = "mins"; | ||
| interval = "mins"; | ||
| } else { | ||
| this.duration = this.args.durationHours; | ||
| this.selectedInterval = "hours"; | ||
| interval = "hours"; | ||
| } | ||
| return interval; |
There was a problem hiding this comment.
Similar here:
if (this.args.durationHours === null) {
return "hours";
} else if (this.args.durationHours >= 8760) {
return "years";
} else if (this.args.durationHours >= 730) {
return "months";
} else if (this.args.durationHours >= 24) {
return "days";
} else if (this.args.durationHours >= 1) {
return "hours";
} else {
return "mins";
}
Comment on lines
69
to
85
| let duration; | ||
| if (this.args.durationMinutes >= 525600) { | ||
| this.duration = this._roundedDuration( | ||
| duration = this._roundedDuration( | ||
| this.args.durationMinutes / 365 / 60 / 24 | ||
| ); | ||
| this.selectedInterval = "years"; | ||
| } else if (this.args.durationMinutes >= 43800) { | ||
| this.duration = this._roundedDuration( | ||
| duration = this._roundedDuration( | ||
| this.args.durationMinutes / 30 / 60 / 24 | ||
| ); | ||
| this.selectedInterval = "months"; | ||
| } else if (this.args.durationMinutes >= 1440) { | ||
| this.duration = this._roundedDuration( | ||
| this.args.durationMinutes / 60 / 24 | ||
| ); | ||
| this.selectedInterval = "days"; | ||
| duration = this._roundedDuration(this.args.durationMinutes / 60 / 24); | ||
| } else if (this.args.durationMinutes >= 60) { | ||
| duration = this._roundedDuration(this.args.durationMinutes / 60); | ||
| } else { | ||
| duration = this.args.durationMinutes; | ||
| } | ||
| return duration; |
There was a problem hiding this comment.
and here, and the method below.
btw, all 4 should be getters instead.
…t-settings-test.js Co-authored-by: Jarek Radosz <jradosz@gmail.com>
…t-settings-test.js Co-authored-by: Jarek Radosz <jradosz@gmail.com>
…picker.gjs Co-authored-by: Jarek Radosz <jradosz@gmail.com>
CvX
approved these changes
May 9, 2024
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Previously, we only updated the duration and interval values in the constructor. So whenever the initial values are updated in the form the changes are not reflected in the UI. To fix this issue we're using "get" methods in this PR.