From 31fec51d259338ffa6af529fb7b966488db26f17 Mon Sep 17 00:00:00 2001 From: Ian Jones Date: Thu, 10 Oct 2024 10:53:31 +0100 Subject: [PATCH 1/3] fix: Remove redundant tooltip on URL copy --- .../ServiceSettings/FlowStatus/PublicLink.tsx | 41 +++++++++---------- 1 file changed, 19 insertions(+), 22 deletions(-) diff --git a/editor.planx.uk/src/pages/FlowEditor/components/Settings/ServiceSettings/FlowStatus/PublicLink.tsx b/editor.planx.uk/src/pages/FlowEditor/components/Settings/ServiceSettings/FlowStatus/PublicLink.tsx index 6bc4a1fab3..6b01df2353 100644 --- a/editor.planx.uk/src/pages/FlowEditor/components/Settings/ServiceSettings/FlowStatus/PublicLink.tsx +++ b/editor.planx.uk/src/pages/FlowEditor/components/Settings/ServiceSettings/FlowStatus/PublicLink.tsx @@ -2,7 +2,6 @@ import ContentCopyIcon from "@mui/icons-material/ContentCopy"; import Box from "@mui/material/Box"; import Button from "@mui/material/Button"; import Link from "@mui/material/Link"; -import Tooltip from "@mui/material/Tooltip"; import Typography from "@mui/material/Typography"; import { FlowStatus } from "@opensystemslab/planx-core/types"; import React, { useState } from "react"; @@ -11,27 +10,25 @@ import SettingsDescription from "ui/editor/SettingsDescription"; const CopyButton = (props: { link: string; isActive: boolean }) => { const [copyMessage, setCopyMessage] = useState<"copy" | "copied">("copy"); return ( - - - + ); }; From 988a2c8aa361de58cdf22b1e91aecf441a237c2c Mon Sep 17 00:00:00 2001 From: Ian Jones Date: Thu, 10 Oct 2024 10:53:47 +0100 Subject: [PATCH 2/3] Revert "fix: Remove redundant tooltip on URL copy" This reverts commit 31fec51d259338ffa6af529fb7b966488db26f17. --- .../ServiceSettings/FlowStatus/PublicLink.tsx | 41 ++++++++++--------- 1 file changed, 22 insertions(+), 19 deletions(-) diff --git a/editor.planx.uk/src/pages/FlowEditor/components/Settings/ServiceSettings/FlowStatus/PublicLink.tsx b/editor.planx.uk/src/pages/FlowEditor/components/Settings/ServiceSettings/FlowStatus/PublicLink.tsx index 6b01df2353..6bc4a1fab3 100644 --- a/editor.planx.uk/src/pages/FlowEditor/components/Settings/ServiceSettings/FlowStatus/PublicLink.tsx +++ b/editor.planx.uk/src/pages/FlowEditor/components/Settings/ServiceSettings/FlowStatus/PublicLink.tsx @@ -2,6 +2,7 @@ import ContentCopyIcon from "@mui/icons-material/ContentCopy"; import Box from "@mui/material/Box"; import Button from "@mui/material/Button"; import Link from "@mui/material/Link"; +import Tooltip from "@mui/material/Tooltip"; import Typography from "@mui/material/Typography"; import { FlowStatus } from "@opensystemslab/planx-core/types"; import React, { useState } from "react"; @@ -10,25 +11,27 @@ import SettingsDescription from "ui/editor/SettingsDescription"; const CopyButton = (props: { link: string; isActive: boolean }) => { const [copyMessage, setCopyMessage] = useState<"copy" | "copied">("copy"); return ( - + + + ); }; From 5031cbde650880a33811f8c813b7ded9457c6d17 Mon Sep 17 00:00:00 2001 From: Ian Jones Date: Thu, 10 Oct 2024 10:54:27 +0100 Subject: [PATCH 3/3] fix: Remove redundant tooltip on URL copy --- .../ServiceSettings/FlowStatus/PublicLink.tsx | 41 +++++++++---------- 1 file changed, 19 insertions(+), 22 deletions(-) diff --git a/editor.planx.uk/src/pages/FlowEditor/components/Settings/ServiceSettings/FlowStatus/PublicLink.tsx b/editor.planx.uk/src/pages/FlowEditor/components/Settings/ServiceSettings/FlowStatus/PublicLink.tsx index 6bc4a1fab3..6b01df2353 100644 --- a/editor.planx.uk/src/pages/FlowEditor/components/Settings/ServiceSettings/FlowStatus/PublicLink.tsx +++ b/editor.planx.uk/src/pages/FlowEditor/components/Settings/ServiceSettings/FlowStatus/PublicLink.tsx @@ -2,7 +2,6 @@ import ContentCopyIcon from "@mui/icons-material/ContentCopy"; import Box from "@mui/material/Box"; import Button from "@mui/material/Button"; import Link from "@mui/material/Link"; -import Tooltip from "@mui/material/Tooltip"; import Typography from "@mui/material/Typography"; import { FlowStatus } from "@opensystemslab/planx-core/types"; import React, { useState } from "react"; @@ -11,27 +10,25 @@ import SettingsDescription from "ui/editor/SettingsDescription"; const CopyButton = (props: { link: string; isActive: boolean }) => { const [copyMessage, setCopyMessage] = useState<"copy" | "copied">("copy"); return ( - - - + ); };