Skip to content

The easy-to-use open source Business Intelligence and Embedded Analytics tool that lets everyone work with data :bar_chart:

GDGT-1781 Fix flaky "should check out transform into a new workspace from the transform page" e2e test (#69619)

Kamil Mielnika1b8cbca8342
diff --git a/e2e/test/scenarios/data-studio/workspaces.cy.spec.ts b/e2e/test/scenarios/data-studio/workspaces.cy.spec.ts
index 24c42b1b191..7162d958203 100644
--- a/e2e/test/scenarios/data-studio/workspaces.cy.spec.ts
+++ b/e2e/test/scenarios/data-studio/workspaces.cy.spec.ts
@@ -1580,10 +1580,11 @@ describe("scenarios > data studio > workspaces", () => {
createWorkspace();
registerWorkspaceAliasName("workspaceB");
- Workspaces.getMainlandTransforms()
- .findByText("SQL transform")
- .should("be.visible")
- .click();
+ Workspaces.getMainlandTransforms().within(() => {
+ cy.findByText("SQL transform").should("be.visible");
+ // intentionally not chaining the click since it makes the test flaky
+ cy.findByText("SQL transform").click();
+ });
Workspaces.getWorkspaceContent().within(() => {
H.NativeEditor.type(" LIMIT 2");
@@ -2478,6 +2479,7 @@ function enableWorkspacesInDb(id: DatabaseId) {
function createWorkspace() {
Workspaces.getNewWorkspaceButton().click();
+ cy.findByTestId("loading-indicator").should("not.exist");
}
const TEST_PYTHON_TRANSFORM = dedent`
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/workspaces/pages/WorkspacePage/CodeTab/CodeTab.tsx b/enterprise/frontend/src/metabase-enterprise/data-studio/workspaces/pages/WorkspacePage/CodeTab/CodeTab.tsx
index 903c5b4eea3..925e5def2f7 100644
--- a/enterprise/frontend/src/metabase-enterprise/data-studio/workspaces/pages/WorkspacePage/CodeTab/CodeTab.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/workspaces/pages/WorkspacePage/CodeTab/CodeTab.tsx
@@ -3,7 +3,7 @@ import { t } from "ttag";
import { skipToken } from "metabase/api";
import { EmptyState } from "metabase/common/components/EmptyState";
-import { Stack, Text } from "metabase/ui";
+import { Flex, Skeleton, Stack, Text } from "metabase/ui";
import { useGetExternalTransformsQuery } from "metabase-enterprise/api";
import { getCheckoutDisabledMessage } from "metabase-enterprise/data-studio/workspaces/utils";
import type {
@@ -20,10 +20,7 @@ import {
useWorkspace,
} from "../WorkspaceProvider";
-import {
- TransformListItem,
- TransformListItemSkeleton,
-} from "./TransformListItem";
+import { TransformListItem } from "./TransformListItem";
import { TransformListItemMenu } from "./TransformListItemMenu";
/** Item that can be displayed in the workspace transforms list */
@@ -114,11 +111,7 @@ export const CodeTab = ({
<Stack gap={0}>
<Text fw={600}>{t`Workspace transforms`}</Text>
{isLoadingWorkspaceTransforms ? (
- <>
- <TransformListItemSkeleton />
- <TransformListItemSkeleton />
- <TransformListItemSkeleton />
- </>
+ <LoadingSkeleton />
) : (
workspaceTransforms.map((item) => {
const itemId = getWorkspaceTransformItemId(item);
@@ -162,11 +155,7 @@ export const CodeTab = ({
<Text fw={600} mt="sm">{t`Available transforms`}</Text>
{isLoading ? (
- <>
- <TransformListItemSkeleton />
- <TransformListItemSkeleton />
- <TransformListItemSkeleton />
- </>
+ <LoadingSkeleton />
) : error ? (
<Text c="error" size="sm">{t`Failed to load transforms`}</Text>
) : (
@@ -196,3 +185,22 @@ export const CodeTab = ({
</Stack>
);
};
+
+function LoadingSkeleton() {
+ return (
+ <Stack data-testid="loading-indicator" gap="md" py="sm">
+ <TransformListItemSkeleton />
+ <TransformListItemSkeleton />
+ <TransformListItemSkeleton />
+ </Stack>
+ );
+}
+
+function TransformListItemSkeleton() {
+ return (
+ <Flex align="center" gap="sm" px="md">
+ <Skeleton h={14} w={14} circle />
+ <Skeleton h={14} w="70%" />
+ </Flex>
+ );
+}
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/workspaces/pages/WorkspacePage/CodeTab/TransformListItem.tsx b/enterprise/frontend/src/metabase-enterprise/data-studio/workspaces/pages/WorkspacePage/CodeTab/TransformListItem.tsx
index a0cf7d49bdb..0ff519d6032 100644
--- a/enterprise/frontend/src/metabase-enterprise/data-studio/workspaces/pages/WorkspacePage/CodeTab/TransformListItem.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/workspaces/pages/WorkspacePage/CodeTab/TransformListItem.tsx
@@ -5,10 +5,8 @@ import { t } from "ttag";
import {
Box,
type BoxProps,
- Flex,
Icon,
type IconName,
- Skeleton,
Text,
Tooltip,
} from "metabase/ui";
@@ -69,12 +67,3 @@ export const TransformListItem = ({
</Box>
);
};
-
-export function TransformListItemSkeleton() {
- return (
- <Flex align="center" gap="sm" py="xs" px="sm" pl="md">
- <Skeleton h={14} w={14} circle />
- <Skeleton h={14} w="70%" />
- </Flex>
- );
-}