DEV: Resolve remind-assigns-frequency computed-property.override deprecation
This commit is contained in:
parent
a655a009fa
commit
821df835bd
|
|
@ -1,26 +1,24 @@
|
||||||
import Component from "@ember/component";
|
import Component from "@ember/component";
|
||||||
import I18n from "I18n";
|
import I18n from "I18n";
|
||||||
import discourseComputed from "discourse-common/utils/decorators";
|
import { inject as service } from "@ember/service";
|
||||||
|
import { action } from "@ember/object";
|
||||||
|
|
||||||
export default Component.extend({
|
export default Component.extend({
|
||||||
@discourseComputed(
|
siteSettings: service(),
|
||||||
"user.custom_fields.remind_assigns_frequency",
|
|
||||||
"siteSettings.remind_assigns_frequency"
|
get selectedFrequency() {
|
||||||
)
|
const frequency = this.user.get("custom_fields.remind_assigns_frequency");
|
||||||
selectedFrequency(userAssignsFrequency, siteDefaultAssignsFrequency) {
|
|
||||||
if (
|
if (
|
||||||
this.availableFrequencies
|
this.availableFrequencies.map((freq) => freq.value).includes(frequency)
|
||||||
.map((freq) => freq.value)
|
|
||||||
.includes(userAssignsFrequency)
|
|
||||||
) {
|
) {
|
||||||
return userAssignsFrequency;
|
return frequency;
|
||||||
}
|
}
|
||||||
|
|
||||||
return siteDefaultAssignsFrequency;
|
return this.siteSettings.remind_assigns_frequency;
|
||||||
},
|
},
|
||||||
|
|
||||||
@discourseComputed("user.reminders_frequency")
|
get availableFrequencies() {
|
||||||
availableFrequencies(userRemindersFrequency) {
|
const userRemindersFrequency = this.get("user.reminders_frequency");
|
||||||
return userRemindersFrequency.map((freq) => {
|
return userRemindersFrequency.map((freq) => {
|
||||||
return {
|
return {
|
||||||
name: I18n.t(freq.name),
|
name: I18n.t(freq.name),
|
||||||
|
|
@ -29,4 +27,9 @@ export default Component.extend({
|
||||||
};
|
};
|
||||||
});
|
});
|
||||||
},
|
},
|
||||||
|
|
||||||
|
@action
|
||||||
|
updateSelectedFrequency(value) {
|
||||||
|
this.user.set("custom_fields.remind_assigns_frequency", value);
|
||||||
|
},
|
||||||
});
|
});
|
||||||
|
|
|
||||||
|
|
@ -6,7 +6,7 @@
|
||||||
@valueProperty="value"
|
@valueProperty="value"
|
||||||
@content={{availableFrequencies}}
|
@content={{availableFrequencies}}
|
||||||
@value={{selectedFrequency}}
|
@value={{selectedFrequency}}
|
||||||
@onChange={{action (mut user.custom_fields.remind_assigns_frequency)}}
|
@onChange={{action "updateSelectedFrequency"}}
|
||||||
/>
|
/>
|
||||||
</div>
|
</div>
|
||||||
{{/if}}
|
{{/if}}
|
||||||
Loading…
Reference in New Issue