OpenSourceArk/Ghost
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed ForceUpgrade state not working with Explore

Browse Source 
no issue

- When a user is in forced upgrade state, clicking on `Explore` would keep them trapped inside of the Explore frame rather than redirecting to Ghost(Pro)
This commit is contained in:
Aileen Booker 2023-09-25 12:35:02 +01:00 committed by Aileen Booker
parent da28aa5fc9
commit 907796d857
1 changed files with 12 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
ghost/admin/app/services/explore.js
View File

@ -1,4 +1,5 @@
import Service, {inject as service} from '@ember/service';
import {inject} from 'ghost-admin/decorators/inject';
import {tracked} from '@glimmer/tracking';
export default class ExploreService extends Service {
@ -6,6 +7,8 @@ export default class ExploreService extends Service {
@service feature;
@service ghostPaths;
@inject config;
exploreUrl = 'https://ghost.org/explore/';
exploreRouteRoot = '#/explore';
submitRoute = 'submit';
@ -88,6 +91,11 @@ export default class ExploreService extends Service {
// and the URL opened on the iframe. It is responsible to non user triggered iframe opening,
// for example: by entering "/explore" route in the URL or using history navigation (back and forward)
toggleExploreWindow(value) {
if (this.config.hostSettings?.forceUpgrade && value) {
// don't attempt to open Explore iframe when in Force Upgrade state
return;
}
if (this.exploreWindowOpen && value) {
// don't attempt to open again
return;
@ -96,6 +104,10 @@ export default class ExploreService extends Service {
}
openExploreWindow() {
if (this.config.hostSettings?.forceUpgrade) {
// don't attempt to open Explore iframe when in Force Upgrade state
return;
}
if (this.exploreWindowOpen) {
// don't attempt to open again
return;