diff --git a/config.py b/config.py index 3b9023002..c80890e23 100644 --- a/config.py +++ b/config.py @@ -872,7 +872,7 @@ class DefaultConfig(ImmutableConfig): } # User feedback form for UI-V2 - UI_V2_FEEDBACK_FORM = "https://7qdvkuo9rkj.typeform.com/to/XH5YE79P" + UI_V2_FEEDBACK_FORM = None # Default to new UI DEFAULT_UI = "react" diff --git a/web/cypress/e2e/system-status-banner.cy.ts b/web/cypress/e2e/system-status-banner.cy.ts index e074d1124..fe32fd0ae 100644 --- a/web/cypress/e2e/system-status-banner.cy.ts +++ b/web/cypress/e2e/system-status-banner.cy.ts @@ -108,7 +108,7 @@ describe('System Status Banner', () => { }); describe('Banner positioning', () => { - it('appears after the feedback banner', () => { + it('displays correctly in page layout', () => { cy.intercept('GET', '/config', (req) => req.reply((res) => { res.body.registry_state = 'readonly'; @@ -119,8 +119,7 @@ describe('System Status Banner', () => { cy.visit('/organization'); cy.wait('@getConfig'); - // The read-only banner should exist after the feedback banner - // We can verify this by checking the DOM order + // The read-only banner should be visible in the page cy.get('[data-testid="readonly-mode-banner"]') .should('be.visible') .parent() diff --git a/web/src/routes/PluginMain.tsx b/web/src/routes/PluginMain.tsx index e7635aa7d..7bdc5367e 100644 --- a/web/src/routes/PluginMain.tsx +++ b/web/src/routes/PluginMain.tsx @@ -128,27 +128,29 @@ function PluginMain() { )} - - - - - - - Please use{' '} - - this form - {' '} - to provide feedback on your experience - - - + {quayConfig?.config?.UI_V2_FEEDBACK_FORM && ( + + + + + + + Please use{' '} + + this form + {' '} + to provide feedback on your experience + + + + )} {user && ( - - - - - - - Please use{' '} - - this form - {' '} - to provide feedback on your experience - - - + + + + + + + + Please use{' '} + + this form + {' '} + to provide feedback on your experience + + + +