The easy-to-use open source Business Intelligence and Embedded Analytics tool that lets everyone work with data :bar_chart:
TypeScript analyticsbibusiness-intelligencebusinessintelligenceclojuredashboarddatadata-analysisdata-visualizationdatabasemetabasemysqlpostgrespostgresqlreportingslacksql-editorvisualization
Do not allow setting up remote sync if git url is not set (#66281)
Andersonc8d87bdf7beb
diff --git a/e2e/test/scenarios/admin/remote-sync.cy.spec.ts b/e2e/test/scenarios/admin/remote-sync.cy.spec.tsindex 22b9ce0b8b8..6827b65c89d 100644--- a/e2e/test/scenarios/admin/remote-sync.cy.spec.ts+++ b/e2e/test/scenarios/admin/remote-sync.cy.spec.ts@@ -512,6 +512,31 @@ describe("Remote Sync", () => {});});+ it("should disable 'Set up Remote Sync' button if git url is not set (#65653)", () => {+ cy.visit("/admin/settings/remote-sync");+ cy.button("Set up Remote Sync").should("be.disabled");++ cy.findByRole("switch", { name: "Auto-sync with git" }).click({+ force: true,+ });++ // Trivial dirty state should not be enough to enable the button+ cy.button("Set up Remote Sync").should("be.disabled");++ cy.findByLabelText(/Access Token/i)+ .clear()+ .type("SecretToken");+ // Still disabled - url is not set+ cy.button("Set up Remote Sync").should("be.disabled");++ cy.findByLabelText(/repository url/i)+ .clear()+ .type(LOCAL_GIT_URL);++ // Enabled now - url is set+ cy.button("Set up Remote Sync").should("be.enabled");+ });+it("shows an error if git settings are invalid", () => {cy.intercept("PUT", "/api/ee/remote-sync/settings").as("saveSettings");cy.visit("/admin/settings/remote-sync");diff --git a/enterprise/frontend/src/metabase-enterprise/remote_sync/components/RemoteSyncAdminSettings/RemoteSyncAdminSettings.tsx b/enterprise/frontend/src/metabase-enterprise/remote_sync/components/RemoteSyncAdminSettings/RemoteSyncAdminSettings.tsxindex e0700ea0c76..5f95f9e6a19 100644--- a/enterprise/frontend/src/metabase-enterprise/remote_sync/components/RemoteSyncAdminSettings/RemoteSyncAdminSettings.tsx+++ b/enterprise/frontend/src/metabase-enterprise/remote_sync/components/RemoteSyncAdminSettings/RemoteSyncAdminSettings.tsx@@ -312,7 +312,9 @@ export const RemoteSyncAdminSettings = () => {: t`Set up Remote Sync`}variant="filled"- disabled={!dirty}+ disabled={+ isRemoteSyncEnabled ? !dirty : !values?.[URL_KEY]+ }flex="auto 0 0"/></Flex>diff --git a/enterprise/frontend/src/metabase-enterprise/remote_sync/components/SyncProgressModal.tsx b/enterprise/frontend/src/metabase-enterprise/remote_sync/components/SyncProgressModal.tsxindex ec4e75aa947..007c6e0681e 100644--- a/enterprise/frontend/src/metabase-enterprise/remote_sync/components/SyncProgressModal.tsx+++ b/enterprise/frontend/src/metabase-enterprise/remote_sync/components/SyncProgressModal.tsx@@ -47,6 +47,10 @@ export function SyncProgressModal({icon: "warning",toastColor: "error",});++ if (message.match(/no active task/i)) {+ onDismiss();+ }});};