mirror of
https://github.com/TryGhost/Ghost.git
synced 2024-12-21 01:41:46 +03:00
7b443d4b63
no issue
The `config` service has been a source of confusion when writing with modern Ember patterns because it's use of the deprecated `ProxyMixin` forced all property access/setting to go via `.get()` and `.set()` whereas the rest of the system has mostly (there are a few other uses of ProxyObjects remaining) eliminated the use of the non-native get/set methods.
- removed use of `ProxyMixin` in the `config` service by grabbing the API response after fetching and using `Object.defineProperty()` to add native getters/setters that pass through to a tracked object holding the API response data. Ember's autotracking automatically works across the native getters/setters so we can then use the service as if it was any other native object
- updated all code to use `config.{attrName}` directly for getting/setting instead of `.get()` and `.set()`
- removed unnecessary async around `config.availableTimezones` which wasn't making any async calls
31 lines
995 B
JavaScript
31 lines
995 B
JavaScript
import Route from '@ember/routing/route';
|
|
import {inject as service} from '@ember/service';
|
|
|
|
Route.reopen({
|
|
config: service(),
|
|
billing: service(),
|
|
router: service(),
|
|
|
|
actions: {
|
|
willTransition(transition) {
|
|
if (this.get('upgradeStatus.isRequired')) {
|
|
transition.abort();
|
|
this.upgradeStatus.requireUpgrade();
|
|
return false;
|
|
} else if (this.config.hostSettings?.forceUpgrade) {
|
|
// Do not prevent transitions to the BMA or to signout
|
|
if (transition.to?.name === 'pro.index' || transition.to?.name === 'signout') {
|
|
return true;
|
|
}
|
|
|
|
transition.abort();
|
|
// Catch and redirect every route in a force upgrade state
|
|
this.billing.openBillingWindow(this.router.currentURL, '/pro');
|
|
return false;
|
|
} else {
|
|
return true;
|
|
}
|
|
}
|
|
}
|
|
});
|