Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Alter instance editor links pointing to the immersive editor to point to the default editor #3791

Merged
merged 3 commits into from
Apr 29, 2024
Merged

Alter instance editor links pointing to the immersive editor to point to the default editor #3791

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
3fd45a6
Disable instance editor links pointing to the immersive editor
cstns Apr 29, 2024
c5ccc6f
Fix e2e tests
cstns Apr 29, 2024
b411a5d
Merge branch 'main' into 3786-immersive-editor-refuses-to-connect-in-…
knolleary Apr 29, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 6 additions & 1 deletion frontend/src/pages/instance/components/EditorLink.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,10 +43,15 @@ export default {
required: true
}
},
data () {
return {
canUseImmersiveEditor: false
}
},
computed: {
...mapState('account', ['team', 'teamMembership']),
isImmersiveEditor () {
return SemVer.satisfies(SemVer.coerce(this.instance?.meta?.versions?.launcher), '>=2.3.1')
return this.canUseImmersiveEditor && SemVer.satisfies(SemVer.coerce(this.instance?.meta?.versions?.launcher), '>=2.3.1')
},
url () {
if (this.isImmersiveEditor) {
Expand Down
10 changes: 5 additions & 5 deletions test/e2e/frontend/cypress/tests/instances/editor.spec.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,12 +54,12 @@ describe('FlowForge - Instance editor', () => {

cy.get('[data-action="open-editor"]')
.children()
.should('not.exist')
.should('exist') // todo revert when the editor is ready

cy.get('[data-action="open-editor"]').click()

cy.get('[data-el="editor-iframe"]').should('exist')
cy.get('[data-el="tabs-drawer"]').should('exist')
// cy.get('[data-action="open-editor"]').click()
//
// cy.get('[data-el="editor-iframe"]').should('exist')
// cy.get('[data-el="tabs-drawer"]').should('exist')
})

it('has working drawer navigation tabs', () => {
Expand Down
Loading