Skip to content

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

fix(sdk, embed-js, static): Fix Static embedding styles (#65796)

Timofey Kachalov582936513664
diff --git a/enterprise/frontend/src/embedding-sdk-bundle/components/private/SdkQuestionDefaultView/SdkQuestionDefaultView.module.css b/enterprise/frontend/src/embedding-sdk-bundle/components/private/SdkQuestionDefaultView/SdkQuestionDefaultView.module.css
index c0f31290ee7..95cb298992b 100644
--- a/enterprise/frontend/src/embedding-sdk-bundle/components/private/SdkQuestionDefaultView/SdkQuestionDefaultView.module.css
+++ b/enterprise/frontend/src/embedding-sdk-bundle/components/private/SdkQuestionDefaultView/SdkQuestionDefaultView.module.css
@@ -1,4 +1,18 @@
.Container {
+ display: grid;
+ grid-template: 1fr / 1fr;
+ grid-template-areas: "Main";
+}
+
+.Container:has(.TopBar) {
+ display: grid;
+ grid-template: auto 1fr / 1fr;
+ grid-template-areas:
+ "TopBar"
+ "Main";
+}
+
+.Container:has(.TopBar):has(.MidBar) {
display: grid;
grid-template: auto auto 1fr / 1fr;
grid-template-areas:
@@ -11,6 +25,14 @@
grid-area: TopBar;
}
+.TopBar:empty {
+ display: none;
+}
+
+.BackButtonWrapper:empty {
+ display: none;
+}
+
.MidBar {
grid-area: MidBar;
}
diff --git a/enterprise/frontend/src/embedding-sdk-bundle/components/private/SdkQuestionDefaultView/SdkQuestionDefaultView.tsx b/enterprise/frontend/src/embedding-sdk-bundle/components/private/SdkQuestionDefaultView/SdkQuestionDefaultView.tsx
index 878dfd0da03..2a98373543d 100644
--- a/enterprise/frontend/src/embedding-sdk-bundle/components/private/SdkQuestionDefaultView/SdkQuestionDefaultView.tsx
+++ b/enterprise/frontend/src/embedding-sdk-bundle/components/private/SdkQuestionDefaultView/SdkQuestionDefaultView.tsx
@@ -181,7 +181,7 @@ export const SdkQuestionDefaultView = ({
data-testid="interactive-question-top-toolbar"
>
<Group gap="xs">
- <Box mr="sm">
+ <Box className={InteractiveQuestionS.BackButtonWrapper} mr="sm">
<BackButton />
</Box>
<DefaultViewTitle
diff --git a/enterprise/frontend/src/embedding-sdk-bundle/components/public/StaticQuestion/StaticQuestion.tsx b/enterprise/frontend/src/embedding-sdk-bundle/components/public/StaticQuestion/StaticQuestion.tsx
index eb48182669c..b1c91912d93 100644
--- a/enterprise/frontend/src/embedding-sdk-bundle/components/public/StaticQuestion/StaticQuestion.tsx
+++ b/enterprise/frontend/src/embedding-sdk-bundle/components/public/StaticQuestion/StaticQuestion.tsx
@@ -21,12 +21,13 @@ import {
} from "embedding-sdk-bundle/components/private/SdkQuestion/components";
import { ResultToolbar } from "embedding-sdk-bundle/components/private/SdkQuestion/components/ResultToolbar/ResultToolbar";
import { DefaultViewTitle } from "embedding-sdk-bundle/components/private/SdkQuestionDefaultView/DefaultViewTitle";
+import InteractiveQuestionS from "embedding-sdk-bundle/components/private/SdkQuestionDefaultView/SdkQuestionDefaultView.module.css";
import {
SdkQuestion,
type SdkQuestionProps,
} from "embedding-sdk-bundle/components/public/SdkQuestion/SdkQuestion";
import { StaticQuestionSdkMode } from "embedding-sdk-bundle/components/public/StaticQuestion/mode";
-import { Stack } from "metabase/ui";
+import { Box, Stack } from "metabase/ui";
import { getEmbeddingMode } from "metabase/visualizations/click-actions/lib/modes";
import type { ClickActionModeGetter } from "metabase/visualizations/types";
import type Question from "metabase-lib/v1/Question";
@@ -103,6 +104,8 @@ const StaticQuestionInner = ({
);
};
+ const hasTopBar = Boolean(title || withChartTypeSelector || withDownloads);
+
return (
<SdkQuestion
questionId={questionId}
@@ -114,27 +117,40 @@ const StaticQuestionInner = ({
>
{children ?? (
<FlexibleSizeComponent
+ className={className}
width={width}
height={height}
- className={className}
style={style}
>
- <Stack gap="sm" w="100%" h="100%">
- {title && <DefaultViewTitle title={title} />}
+ <Stack
+ className={InteractiveQuestionS.Container}
+ w="100%"
+ h="100%"
+ gap="xs"
+ >
+ {hasTopBar && (
+ <Stack className={InteractiveQuestionS.TopBar} gap="sm" p="md">
+ {title && <DefaultViewTitle title={title} />}
- {(withChartTypeSelector || withDownloads) && (
- <ResultToolbar>
- {withChartTypeSelector && <SdkQuestion.ChartTypeDropdown />}
- {withDownloads && <SdkQuestion.DownloadWidgetDropdown />}
- </ResultToolbar>
+ {(withChartTypeSelector || withDownloads) && (
+ <ResultToolbar>
+ {withChartTypeSelector && <SdkQuestion.ChartTypeDropdown />}
+ {withDownloads && <SdkQuestion.DownloadWidgetDropdown />}
+ </ResultToolbar>
+ )}
+ </Stack>
)}
- <SdkQuestion.QuestionVisualization
- height={height}
- width={width}
- className={className}
- style={style}
- />
+ <Box className={InteractiveQuestionS.Main} w="100%" h="100%">
+ <Box className={InteractiveQuestionS.Content}>
+ <SdkQuestion.QuestionVisualization
+ height={height}
+ width={width}
+ className={className}
+ style={style}
+ />
+ </Box>
+ </Box>
</Stack>
</FlexibleSizeComponent>
)}
diff --git a/frontend/src/metabase/public/components/EmbedModal/StaticEmbedSetupPane/ParametersSettings.tsx b/frontend/src/metabase/public/components/EmbedModal/StaticEmbedSetupPane/ParametersSettings.tsx
index c698c9a0c02..67727d8ad90 100644
--- a/frontend/src/metabase/public/components/EmbedModal/StaticEmbedSetupPane/ParametersSettings.tsx
+++ b/frontend/src/metabase/public/components/EmbedModal/StaticEmbedSetupPane/ParametersSettings.tsx
@@ -6,6 +6,7 @@ import { t } from "ttag";
import Select, { Option } from "metabase/common/components/Select";
import CS from "metabase/css/core/index.css";
import { ParameterWidget as StaticParameterWidget } from "metabase/parameters/components/ParameterWidget";
+import { getParameterIconName } from "metabase/parameters/utils/ui";
import type {
EmbedResourceParameter,
EmbedResourceType,
@@ -13,7 +14,6 @@ import type {
EmbeddingParameters,
EmbeddingParametersValues,
} from "metabase/public/lib/types";
-import type { IconName } from "metabase/ui";
import { Box, Divider, Icon, Stack, Text } from "metabase/ui";
import { getValuePopulatedParameters } from "metabase-lib/v1/parameters/utils/parameter-values";
@@ -65,7 +65,7 @@ export const ParametersSettings = ({
{resourceParameters.map((parameter) => (
<div key={parameter.id} className={cx(CS.flex, CS.alignCenter)}>
- <Icon name={getIconForParameter(parameter)} className={CS.mr2} />
+ <Icon name={getParameterIconName(parameter)} className={CS.mr2} />
<h3>
{parameter.name}
{parameter.required && (
@@ -149,15 +149,3 @@ export const ParametersSettings = ({
</>
);
};
-
-const getIconForParameter = (parameter: EmbedResourceParameter): IconName => {
- if (parameter.type === "category") {
- return "string";
- }
-
- if (parameter.type.indexOf("date/") === 0) {
- return "calendar";
- }
-
- return "unknown";
-};