Skip to content

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

Align join source and conditions to the start in the query builder (#85186)

Riley Thompson89de59c20595
diff --git a/frontend/src/metabase/querying/notebook/components/JoinStep/JoinComplete/JoinComplete.module.css b/frontend/src/metabase/querying/notebook/components/JoinStep/JoinComplete/JoinComplete.module.css
index 123219cac59..272ee1ed17e 100644
--- a/frontend/src/metabase/querying/notebook/components/JoinStep/JoinComplete/JoinComplete.module.css
+++ b/frontend/src/metabase/querying/notebook/components/JoinStep/JoinComplete/JoinComplete.module.css
@@ -8,7 +8,6 @@
flex: 1;
flex-basis: 50%;
flex-direction: column;
- align-items: start;
justify-content: center;
gap: 0.5rem;
padding: 0.5rem;
diff --git a/frontend/src/metabase/querying/notebook/components/JoinStep/JoinComplete/JoinComplete.tsx b/frontend/src/metabase/querying/notebook/components/JoinStep/JoinComplete/JoinComplete.tsx
index be14a8bbf24..a739f9e56ee 100644
--- a/frontend/src/metabase/querying/notebook/components/JoinStep/JoinComplete/JoinComplete.tsx
+++ b/frontend/src/metabase/querying/notebook/components/JoinStep/JoinComplete/JoinComplete.tsx
@@ -105,7 +105,11 @@ export function JoinComplete({
return (
<Flex direction={{ base: "column", md: "row" }} gap="sm">
- <NotebookCell className={S.JoinConditionCell} color={color}>
+ <NotebookCell
+ className={S.JoinConditionCell}
+ color={color}
+ align="flex-start"
+ >
<Flex gap={6} align="center">
<NotebookCellItem color={color} disabled aria-label={t`Left table`}>
{tc(lhsTableName)}
@@ -141,6 +145,7 @@ export function JoinComplete({
<NotebookCell
className={S.JoinConditionCell}
color={color}
+ align="flex-start"
p={rem("10px")}
>
{conditions.map((condition, index) => {
diff --git a/frontend/src/metabase/querying/notebook/components/JoinStep/JoinDraft/JoinDraft.module.css b/frontend/src/metabase/querying/notebook/components/JoinStep/JoinDraft/JoinDraft.module.css
index 776cb7714b5..4056aeea0d5 100644
--- a/frontend/src/metabase/querying/notebook/components/JoinStep/JoinDraft/JoinDraft.module.css
+++ b/frontend/src/metabase/querying/notebook/components/JoinStep/JoinDraft/JoinDraft.module.css
@@ -8,7 +8,6 @@
flex: 1;
flex-basis: 50%;
flex-direction: column;
- align-items: start;
justify-content: center;
align-self: stretch;
gap: 0.5rem;
diff --git a/frontend/src/metabase/querying/notebook/components/JoinStep/JoinDraft/JoinDraft.tsx b/frontend/src/metabase/querying/notebook/components/JoinStep/JoinDraft/JoinDraft.tsx
index 347d163252b..511b9f5a0aa 100644
--- a/frontend/src/metabase/querying/notebook/components/JoinStep/JoinDraft/JoinDraft.tsx
+++ b/frontend/src/metabase/querying/notebook/components/JoinStep/JoinDraft/JoinDraft.tsx
@@ -148,6 +148,7 @@ export function JoinDraft({
<NotebookCell
className={S.JoinConditionCell}
color={color}
+ align="flex-start"
data-testid="new-join-condition"
p={rem("6px")}
>