Skip to content

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

[Metabot] Remove indicator for events (#71788)

Sloan Spargercb67a8ff4768
diff --git a/frontend/src/metabase/collections/components/CollectionHeader/CollectionTimeline.tsx b/frontend/src/metabase/collections/components/CollectionHeader/CollectionTimeline.tsx
index f60a3a6988e..1f91c3db5bc 100644
--- a/frontend/src/metabase/collections/components/CollectionHeader/CollectionTimeline.tsx
+++ b/frontend/src/metabase/collections/components/CollectionHeader/CollectionTimeline.tsx
@@ -1,61 +1,27 @@
import { t } from "ttag";
import { Link } from "metabase/common/components/Link/Link";
-import { UserHasSeen } from "metabase/common/components/UserHasSeen/UserHasSeen";
-import { Indicator, Tooltip } from "metabase/ui";
+import { Tooltip } from "metabase/ui";
import * as Urls from "metabase/utils/urls";
import type { Collection } from "metabase-types/api";
import { CollectionHeaderButton } from "./CollectionHeader.styled";
-import { trackEventsClicked } from "./analytics";
interface CollectionTimelineProps {
collection: Collection;
}
-function CollectionTimelineAcknowledgement({
- children,
-}: {
- children: (props: { ack: () => void }) => React.ReactNode;
-}) {
- return (
- <UserHasSeen id="events-menu">
- {({ hasSeen, ack }) => (
- <Indicator disabled={hasSeen} size={6} offset={6}>
- {children({
- ack: () => {
- trackEventsClicked();
- if (!hasSeen) {
- ack();
- }
- },
- })}
- </Indicator>
- )}
- </UserHasSeen>
- );
-}
-
const CollectionTimeline = ({
collection,
}: CollectionTimelineProps): JSX.Element => {
const url = Urls.timelinesInCollection(collection);
return (
- <CollectionTimelineAcknowledgement>
- {({ ack }) => (
- <Tooltip label={t`Events`} position="bottom">
- <div>
- <CollectionHeaderButton
- as={Link}
- to={url}
- icon="calendar"
- onClick={ack}
- />
- </div>
- </Tooltip>
- )}
- </CollectionTimelineAcknowledgement>
+ <Tooltip label={t`Events`} position="bottom">
+ <div>
+ <CollectionHeaderButton as={Link} to={url} icon="calendar" />
+ </div>
+ </Tooltip>
);
};
diff --git a/frontend/src/metabase/collections/components/CollectionHeader/tests/common.unit.spec.tsx b/frontend/src/metabase/collections/components/CollectionHeader/tests/common.unit.spec.tsx
index 54c203002a4..417edbee63a 100644
--- a/frontend/src/metabase/collections/components/CollectionHeader/tests/common.unit.spec.tsx
+++ b/frontend/src/metabase/collections/components/CollectionHeader/tests/common.unit.spec.tsx
@@ -1,6 +1,5 @@
import userEvent from "@testing-library/user-event";
-import { findRequests } from "__support__/server-mocks";
import { screen, within } from "__support__/ui";
import type { CollectionId } from "metabase-types/api";
@@ -190,14 +189,6 @@ describe("CollectionHeader", () => {
setup();
const button = screen.getByLabelText("calendar icon");
expect(button).toBeInTheDocument();
-
- await userEvent.click(button);
- const puts = await findRequests("PUT");
- expect(puts).toHaveLength(1);
-
- expect(puts[0].url).toContain(
- "/api/user-key-value/namespace/user_acknowledgement/key/events-menu",
- );
});
});
diff --git a/frontend/src/metabase/query_builder/components/view/QuestionTimelineWidget/QuestionTimelineWidget.tsx b/frontend/src/metabase/query_builder/components/view/QuestionTimelineWidget/QuestionTimelineWidget.tsx
index a227ebfd1ac..6a92e357ed7 100644
--- a/frontend/src/metabase/query_builder/components/view/QuestionTimelineWidget/QuestionTimelineWidget.tsx
+++ b/frontend/src/metabase/query_builder/components/view/QuestionTimelineWidget/QuestionTimelineWidget.tsx
@@ -1,44 +1,17 @@
import { t } from "ttag";
-import { UserHasSeen } from "metabase/common/components/UserHasSeen/UserHasSeen";
import { ViewFooterButton } from "metabase/common/components/ViewFooterButton";
import { getUiControls } from "metabase/query_builder/selectors";
import {
onCloseTimelines,
onOpenTimelines,
} from "metabase/redux/query-builder";
-import { Indicator } from "metabase/ui";
import { useDispatch, useSelector } from "metabase/utils/redux";
-import { trackEventsClicked } from "./analytics";
-
export interface QuestionTimelineWidgetProps {
className?: string;
}
-function QuestionTimelineAcknowledgement({
- children,
-}: {
- children: (props: { ack: () => void }) => React.ReactNode;
-}) {
- return (
- <UserHasSeen id="events-menu">
- {({ hasSeen, ack }) => (
- <Indicator disabled={hasSeen} size={6} offset={4}>
- {children({
- ack: () => {
- trackEventsClicked();
- if (!hasSeen) {
- ack();
- }
- },
- })}
- </Indicator>
- )}
- </UserHasSeen>
- );
-}
-
export const QuestionTimelineWidget = ({
className,
}: QuestionTimelineWidgetProps): JSX.Element => {
@@ -48,26 +21,21 @@ export const QuestionTimelineWidget = ({
const handleOpenTimelines = () => dispatch(onOpenTimelines());
const handleCloseTimelines = () => dispatch(onCloseTimelines());
- function handleClick(isShowingTimelineSidebar: boolean, ack: () => void) {
+ function handleClick(isShowingTimelineSidebar: boolean) {
if (isShowingTimelineSidebar) {
handleCloseTimelines();
} else {
handleOpenTimelines();
}
- ack();
}
return (
- <QuestionTimelineAcknowledgement>
- {({ ack }) => (
- <ViewFooterButton
- icon="calendar"
- tooltipLabel={t`Events`}
- onClick={() => handleClick(isShowingTimelineSidebar, ack)}
- className={className}
- />
- )}
- </QuestionTimelineAcknowledgement>
+ <ViewFooterButton
+ icon="calendar"
+ tooltipLabel={t`Events`}
+ onClick={() => handleClick(isShowingTimelineSidebar)}
+ className={className}
+ />
);
};