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
Move `{create|delete}PublicLink` to RTK-based hooks (#73508)
Romeo Van Snick62592e850d0f
diff --git a/frontend/src/metabase/actions/containers/ActionCreator/InlineActionSettings.tsx b/frontend/src/metabase/actions/containers/ActionCreator/InlineActionSettings.tsxindex f8f6a4fe76e..5c665b7294d 100644--- a/frontend/src/metabase/actions/containers/ActionCreator/InlineActionSettings.tsx+++ b/frontend/src/metabase/actions/containers/ActionCreator/InlineActionSettings.tsx@@ -2,6 +2,10 @@ import { useDisclosure } from "@mantine/hooks";import type { ChangeEvent, ChangeEventHandler } from "react";import { t } from "ttag";+import {+ useCreateActionPublicLinkMutation,+ useDeleteActionPublicLinkMutation,+} from "metabase/api";import { Button } from "metabase/common/components/Button";import { ConfirmModal } from "metabase/common/components/ConfirmModal";import { CopyWidget } from "metabase/common/components/CopyWidget";@@ -9,18 +13,12 @@ import { FormField } from "metabase/common/components/FormField";import { SidebarContent } from "metabase/common/components/SidebarContent";import { TextArea } from "metabase/common/components/TextArea";import { useUniqueId } from "metabase/common/hooks/use-unique-id";-import { Actions } from "metabase/entities/actions/actions";-import { connect } from "metabase/redux";-import type { State } from "metabase/redux/store";+import { useSelector } from "metabase/redux";import { getSetting } from "metabase/selectors/settings";import { getUserIsAdmin } from "metabase/selectors/user";import { Switch, Tooltip } from "metabase/ui";import * as Urls from "metabase/urls";-import type {- ActionFormSettings,- WritebackAction,- WritebackActionId,-} from "metabase-types/api";+import type { ActionFormSettings, WritebackAction } from "metabase-types/api";import { isActionPublic, isSavedAction } from "../../utils";@@ -29,27 +27,14 @@ import {CopyWidgetContainer,} from "./InlineActionSettings.styled";-interface OwnProps {+type InlineActionSettingsProps = {action?: Partial<WritebackAction>;formSettings: ActionFormSettings;isEditable: boolean;onChangeFormSettings: (formSettings: ActionFormSettings) => void;onClose?: () => void;onBack?: () => void;-}--interface StateProps {- siteUrl: string;- isAdmin: boolean;- isPublicSharingEnabled: boolean;-}--interface DispatchProps {- onCreatePublicLink: ({ id }: { id: WritebackActionId }) => void;- onDeletePublicLink: ({ id }: { id: WritebackActionId }) => void;-}--type ActionSettingsInlineProps = OwnProps & StateProps & DispatchProps;+};export const ActionSettingsTriggerButton = ({onClick,@@ -67,41 +52,32 @@ export const ActionSettingsTriggerButton = ({</Tooltip>);-const mapStateToProps = (state: State): StateProps => ({- siteUrl: getSetting(state, "site-url"),- isAdmin: getUserIsAdmin(state),- isPublicSharingEnabled: getSetting(state, "enable-public-sharing"),-});--const mapDispatchToProps: DispatchProps = {- onCreatePublicLink: Actions.actions.createPublicLink,- onDeletePublicLink: Actions.actions.deletePublicLink,-};-const InlineActionSettings = ({action,formSettings,isEditable,- siteUrl,- isAdmin,- isPublicSharingEnabled,onChangeFormSettings,- onCreatePublicLink,- onDeletePublicLink,onClose,onBack,-}: ActionSettingsInlineProps) => {+}: InlineActionSettingsProps) => {+ const siteUrl = useSelector((state) => getSetting(state, "site-url"));+ const isAdmin = useSelector((state) => getUserIsAdmin(state));+ const isPublicSharingEnabled = useSelector((state) =>+ getSetting(state, "enable-public-sharing"),+ );const id = useUniqueId();const [modalOpened, { open: openModal, close: closeModal }] =useDisclosure(false);const hasSharingPermission = isAdmin && isPublicSharingEnabled;+ const [createPublicLink] = useCreateActionPublicLinkMutation();+ const [deletePublicLink] = useDeleteActionPublicLinkMutation();const handleTogglePublic: ChangeEventHandler<HTMLInputElement> = (event) => {const isPublic = event.target.checked;if (isPublic) {if (isSavedAction(action)) {- onCreatePublicLink({ id: action.id });+ createPublicLink({ id: action.id });}} else {openModal();@@ -110,7 +86,7 @@ const InlineActionSettings = ({const handleDisablePublicLink = () => {if (isSavedAction(action)) {- onDeletePublicLink({ id: action.id });+ deletePublicLink({ id: action.id });}closeModal();};@@ -184,7 +160,4 @@ const InlineActionSettings = ({};// eslint-disable-next-line import/no-default-export -- deprecated usage-export default connect<StateProps, DispatchProps, OwnProps, State>(- mapStateToProps,- mapDispatchToProps,-)(InlineActionSettings);+export default InlineActionSettings;diff --git a/frontend/src/metabase/api/action.ts b/frontend/src/metabase/api/action.tsindex 1705021cc7a..91d0c4c0529 100644--- a/frontend/src/metabase/api/action.ts+++ b/frontend/src/metabase/api/action.ts@@ -117,6 +117,7 @@ export const {useListActionsQuery,useListPublicActionsQuery,useUpdateActionMutation,+ useCreateActionPublicLinkMutation,useDeleteActionPublicLinkMutation,endpoints: {listPublicActions,diff --git a/frontend/src/metabase/entities/actions/actions.ts b/frontend/src/metabase/entities/actions/actions.tsindex 4b44d7d4e95..61b033b0e91 100644--- a/frontend/src/metabase/entities/actions/actions.ts+++ b/frontend/src/metabase/entities/actions/actions.ts@@ -1,4 +1,3 @@-import { updateIn } from "icepick";import { t } from "ttag";import {@@ -6,7 +5,6 @@ import {useGetActionQuery,useListActionsQuery,} from "metabase/api";-import { createThunkAction } from "metabase/redux";import type { Dispatch } from "metabase/redux/store";import { ActionSchema } from "metabase/schema";import type {@@ -105,9 +103,6 @@ const enableImplicitActionsForModel =dispatch(Actions.actions.invalidateLists());};-const CREATE_PUBLIC_LINK = "metabase/entities/actions/CREATE_PUBLIC_LINK";-const DELETE_PUBLIC_LINK = "metabase/entities/actions/DELETE_PUBLIC_LINK";-/*** @deprecated use "metabase/api" instead*/@@ -169,51 +164,4 @@ export const Actions = createEntity({"visualization_settings","archived",],- objectActions: {- createPublicLink: createThunkAction(- CREATE_PUBLIC_LINK,- ({ id }: { id: WritebackActionId }) =>- async (dispatch: Dispatch) => {- const data = await entityCompatibleQuery(- { id },- dispatch,- actionApi.endpoints.createActionPublicLink,- );-- return { id, uuid: data.uuid };- },- ),- deletePublicLink: createThunkAction(- DELETE_PUBLIC_LINK,- ({ id }: { id: WritebackActionId }) =>- async (dispatch: Dispatch) => {- await entityCompatibleQuery(- { id },- dispatch,- actionApi.endpoints.deleteActionPublicLink,- );-- return { id };- },- ),- },- reducer: (state, { type, payload }: { type: string; payload: any }) => {- switch (type) {- case CREATE_PUBLIC_LINK: {- const { id, uuid } = payload;- return updateIn(state, [id], (action) => {- return { ...action, public_uuid: uuid };- });- }- case DELETE_PUBLIC_LINK: {- const { id } = payload;- return updateIn(state, [id], (action) => {- return { ...action, public_uuid: null };- });- }- default: {- return state;- }- }- },});