Merge pull request #3791 from FlowFuse/3786-immersive-editor-refuses-…

…to-connect-in-production Alter instance editor links pointing to the immersive editor to point to the default editor
FlowFuse · Apr 29, 2024 · 8c36a97 · 8c36a97
2 parents 64cd01e + b411a5d
commit 8c36a97
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 6 deletions.
diff --git a/frontend/src/pages/instance/components/EditorLink.vue b/frontend/src/pages/instance/components/EditorLink.vue
@@ -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) {

diff --git a/test/e2e/frontend/cypress/tests/instances/editor.spec.js b/test/e2e/frontend/cypress/tests/instances/editor.spec.js
@@ -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', () => {