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
getting rid of annoying warnings (#69975)
Egor Grushin5dd8b26770c3
diff --git a/enterprise/frontend/src/metabase-enterprise/metabot/state/selectors.ts b/enterprise/frontend/src/metabase-enterprise/metabot/state/selectors.tsindex 315278e95ac..7e430b96459 100644--- a/enterprise/frontend/src/metabase-enterprise/metabot/state/selectors.ts+++ b/enterprise/frontend/src/metabase-enterprise/metabot/state/selectors.ts@@ -2,7 +2,7 @@ import { createSelector } from "@reduxjs/toolkit";import { match } from "ts-pattern";import _ from "underscore";-import { getIsEmbedding } from "metabase/selectors/embed";+import { isEmbedding } from "metabase/embedding/config";import { getLocation } from "metabase/selectors/routing";import { Urls } from "metabase-enterprise/urls";import type { TransformId } from "metabase-types/api";@@ -32,9 +32,8 @@ export const getActiveMetabotAgentIds = createSelector((state) => Object.keys(state.conversations) as MetabotAgentId[],);-export const getMetabotId = createSelector(getIsEmbedding, (isEmbedding) =>- isEmbedding ? FIXED_METABOT_IDS.EMBEDDED : FIXED_METABOT_IDS.DEFAULT,-);+export const getMetabotId = () =>+ isEmbedding() ? FIXED_METABOT_IDS.EMBEDDED : FIXED_METABOT_IDS.DEFAULT;export const getDebugMode = createSelector(getMetabotState,@@ -185,13 +184,16 @@ export const getMetabotReqIdOverride = createSelector((convo) => convo.experimental.metabotReqIdOverride,);-export const getMetabotRequestId = createSelector(- getMetabotReqIdOverride,- getIsEmbedding,- (metabotReqIdOverride, isEmbedding) =>+export const getMetabotRequestId = (+ state: MetabotStoreState,+ agentId: MetabotAgentId,+) => {+ const metabotReqIdOverride = getMetabotReqIdOverride(state, agentId);+ return (metabotReqIdOverride ??- (isEmbedding ? METABOT_REQUEST_IDS.EMBEDDED : undefined),-);+ (isEmbedding() ? METABOT_REQUEST_IDS.EMBEDDED : undefined)+ );+};export const getProfileOverride = createSelector(getMetabotConversation,diff --git a/frontend/src/metabase/admin/permissions/components/PermissionsSelect/PermissionsSelect.jsx b/frontend/src/metabase/admin/permissions/components/PermissionsSelect/PermissionsSelect.jsxindex ce711f3e6ac..e4d573b954d 100644--- a/frontend/src/metabase/admin/permissions/components/PermissionsSelect/PermissionsSelect.jsx+++ b/frontend/src/metabase/admin/permissions/components/PermissionsSelect/PermissionsSelect.jsx@@ -16,13 +16,10 @@ import {ToggleLabel,WarningIcon,} from "./PermissionsSelect.styled";-import {- PermissionsSelectOption,- optionShape,-} from "./PermissionsSelectOption";+import { PermissionsSelectOption } from "./PermissionsSelectOption";const propTypes = {- options: PropTypes.arrayOf(PropTypes.shape(optionShape)).isRequired,+ options: PropTypes.arrayOf(PropTypes.object).isRequired,actions: PropTypes.object,value: PropTypes.string.isRequired,toggleLabel: PropTypes.string,diff --git a/frontend/src/metabase/embedding/config.ts b/frontend/src/metabase/embedding/config.tsindex 89231a96c3e..e36afd5bfaa 100644--- a/frontend/src/metabase/embedding/config.ts+++ b/frontend/src/metabase/embedding/config.ts@@ -1,3 +1,6 @@+import { isEmbeddingSdk } from "metabase/embedding-sdk/config";+import { isWithinIframe } from "metabase/lib/dom";+type InternalEmbeddingConfig = {isPublicEmbedding: boolean;isStaticEmbedding: boolean;@@ -23,3 +26,7 @@ export function isPublicEmbedding() {export function isStaticEmbedding() {return EMBEDDING_CONFIG.isStaticEmbedding;}++export function isEmbedding() {+ return isWithinIframe() || isEmbeddingSdk();+}diff --git a/frontend/src/metabase/querying/notebook/components/DataStep/DataStep.tsx b/frontend/src/metabase/querying/notebook/components/DataStep/DataStep.tsxindex 172ab68fbab..aa4b6856891 100644--- a/frontend/src/metabase/querying/notebook/components/DataStep/DataStep.tsx+++ b/frontend/src/metabase/querying/notebook/components/DataStep/DataStep.tsx@@ -2,9 +2,8 @@ import { type CSSProperties, useMemo, useState } from "react";import { t } from "ttag";import { IconButtonWrapper } from "metabase/common/components/IconButtonWrapper";+import { isEmbedding } from "metabase/embedding/config";import { METAKEY } from "metabase/lib/browser";-import { useSelector } from "metabase/lib/redux";-import { getIsEmbedding } from "metabase/selectors/embed";import { Icon, Popover, Tooltip } from "metabase/ui";import * as Lib from "metabase-lib";@@ -41,7 +40,7 @@ export const DataStep = ({}, [query, stageIndex]);const canSelectTableColumns = table && isRaw && !readOnly;- const isEmbedding = useSelector(getIsEmbedding);+ const isEmbed = isEmbedding();const handleTableChange = async (table: Lib.TableMetadata | Lib.CardMetadata,@@ -58,7 +57,7 @@ export const DataStep = ({return (<NotebookCell color={color}>- {isOpened || !table || isEmbedding ? (+ {isOpened || !table || isEmbed ? (<NotebookDataPickerquery={query}stageIndex={stageIndex}diff --git a/frontend/src/metabase/querying/notebook/components/JoinStep/JoinTablePicker/JoinTablePicker.tsx b/frontend/src/metabase/querying/notebook/components/JoinStep/JoinTablePicker/JoinTablePicker.tsxindex 830b10cc458..ecd04855514 100644--- a/frontend/src/metabase/querying/notebook/components/JoinStep/JoinTablePicker/JoinTablePicker.tsx+++ b/frontend/src/metabase/querying/notebook/components/JoinStep/JoinTablePicker/JoinTablePicker.tsx@@ -3,10 +3,9 @@ import { useState } from "react";import { t } from "ttag";import { IconButtonWrapper } from "metabase/common/components/IconButtonWrapper";+import { isEmbedding } from "metabase/embedding/config";import { METAKEY } from "metabase/lib/browser";import type { ColorName } from "metabase/lib/colors/types";-import { useSelector } from "metabase/lib/redux";-import { getIsEmbedding } from "metabase/selectors/embed";import { Box, Icon, Popover, Tooltip } from "metabase/ui";import type * as Lib from "metabase-lib";@@ -37,11 +36,11 @@ export function JoinTablePicker({onChange,}: JoinTablePickerProps) {const [isOpened, setIsOpened] = useState(!table);- const isEmbedding = useSelector(getIsEmbedding);+ const isEmbed = isEmbedding();return (<Box aria-label={t`Right table`}>- {isOpened || !table || isEmbedding ? (+ {isOpened || !table || isEmbed ? (<NotebookDataPickertitle={t`Pick data to join`}query={query}diff --git a/frontend/src/metabase/querying/notebook/components/NotebookDataPicker/DataPickerTarget.tsx b/frontend/src/metabase/querying/notebook/components/NotebookDataPicker/DataPickerTarget.tsxindex a99934f93a9..e2e131b30e6 100644--- a/frontend/src/metabase/querying/notebook/components/NotebookDataPicker/DataPickerTarget.tsx+++ b/frontend/src/metabase/querying/notebook/components/NotebookDataPicker/DataPickerTarget.tsx@@ -2,10 +2,9 @@ import type React from "react";import { type MouseEvent, type Ref, forwardRef } from "react";import { t } from "ttag";+import { isEmbedding } from "metabase/embedding/config";import { useTranslateContent } from "metabase/i18n/hooks";-import { useSelector } from "metabase/lib/redux";import * as Urls from "metabase/lib/urls";-import { getIsEmbedding } from "metabase/selectors/embed";import type { IconName } from "metabase/ui";import { Flex, Icon, UnstyledButton } from "metabase/ui";import * as Lib from "metabase-lib";@@ -41,10 +40,10 @@ export const DataPickerTarget = forwardRef(function DataPickerTarget(const tc = useTranslateContent();const tableInfo =table != null ? Lib.displayInfo(query, stageIndex, table) : undefined;- const isEmbedding = useSelector(getIsEmbedding);+ const isEmbed = isEmbedding();const openDataSourceInNewTab = () => {- if (isEmbedding) {+ if (isEmbed) {return;}const url = getUrl({ query, table, stageIndex });diff --git a/frontend/src/metabase/querying/notebook/components/NotebookDataPicker/NotebookDataPicker.tsx b/frontend/src/metabase/querying/notebook/components/NotebookDataPicker/NotebookDataPicker.tsxindex b7ee9d73a9d..8c9252546db 100644--- a/frontend/src/metabase/querying/notebook/components/NotebookDataPicker/NotebookDataPicker.tsx+++ b/frontend/src/metabase/querying/notebook/components/NotebookDataPicker/NotebookDataPicker.tsx@@ -13,11 +13,11 @@ import type {MiniPickerItem,MiniPickerPickableItem,} from "metabase/common/components/Pickers/MiniPicker/types";+import { isEmbedding } from "metabase/embedding/config";import { useDispatch, useSelector, useStore } from "metabase/lib/redux";import { checkNotNull } from "metabase/lib/types";import type { QueryEditorDatabasePickerItem } from "metabase/querying/editor/types";import { loadMetadataForTable } from "metabase/questions/actions";-import { getIsEmbedding } from "metabase/selectors/embed";import { getMetadata } from "metabase/selectors/metadata";import { getIsTenantUser } from "metabase/selectors/user";import { Icon, TextInput } from "metabase/ui";@@ -75,7 +75,7 @@ export function NotebookDataPicker({const store = useStore();const dispatch = useDispatch();const onChangeRef = useLatest(onChange);- const isEmbedding = useSelector(getIsEmbedding);+ const isEmbed = isEmbedding();const isTenantUser = useSelector(getIsTenantUser);const handleChange = async (tableId: TableId) => {@@ -97,7 +97,7 @@ export function NotebookDataPicker({// EMB-1144: force the embedding picker if user is a tenant user.// this is to support the sidecar use-case where tenant users are given instance logins.- if (isEmbedding || isTenantUser) {+ if (isEmbed || isTenantUser) {const canSelectTableColumns = table && isRaw && !isDisabled;return (<NotebookCellItemdiff --git a/frontend/src/metabase/selectors/embed.ts b/frontend/src/metabase/selectors/embed.tsindex cc7b4a55351..cb491881152 100644--- a/frontend/src/metabase/selectors/embed.ts+++ b/frontend/src/metabase/selectors/embed.ts@@ -1,6 +1,3 @@-import { createSelector } from "@reduxjs/toolkit";--import { isEmbeddingSdk } from "metabase/embedding-sdk/config";import { isWithinIframe } from "metabase/lib/dom";import type {InteractiveEmbeddingOptionsState,@@ -17,12 +14,3 @@ export const getEmbedOptions = (): InteractiveEmbeddingOptionsState | EmptyObject => {return state.embed.options;};--/**- * TODO: Remove this selector and introduce a function in `frontend/src/metabase/embedding/config.ts` instead.- * Since we won't be getting any value from Redux anymore.- */-export const getIsEmbedding = createSelector(- [getIsEmbeddingIframe],- (isEmbeddingIframe) => isEmbeddingIframe || isEmbeddingSdk(),-);