From a13ebc786f0f11a10ed610e741b174780cf722d8 Mon Sep 17 00:00:00 2001 From: Lais Portugal Date: Mon, 15 Apr 2024 09:18:23 +0100 Subject: [PATCH 1/4] Remove links to join slack community --- packages/studio-base/src/components/AppBar/SettingsMenu.tsx | 1 - packages/studio-base/src/i18n/en/appBar.ts | 1 - packages/theme/src/i18n/en/appBar.ts | 1 - 3 files changed, 3 deletions(-) diff --git a/packages/studio-base/src/components/AppBar/SettingsMenu.tsx b/packages/studio-base/src/components/AppBar/SettingsMenu.tsx index 29af0c92dc..9b92a2c242 100644 --- a/packages/studio-base/src/components/AppBar/SettingsMenu.tsx +++ b/packages/studio-base/src/components/AppBar/SettingsMenu.tsx @@ -94,7 +94,6 @@ export function SettingsMenu({ {t("documentation")} - {t("joinSlackCommunity")} ); diff --git a/packages/studio-base/src/i18n/en/appBar.ts b/packages/studio-base/src/i18n/en/appBar.ts index c9843d396b..2b7786e54d 100644 --- a/packages/studio-base/src/i18n/en/appBar.ts +++ b/packages/studio-base/src/i18n/en/appBar.ts @@ -15,7 +15,6 @@ export const appBar = { hideRightSidebar: "Hide right sidebar", importLayoutFromFile: "Import layout from file…", joinOurSlack: "Join our Slack", - joinSlackCommunity: "Join Slack community", noDataSource: "No data source", open: "Open…", openConnection: "Open connection…", diff --git a/packages/theme/src/i18n/en/appBar.ts b/packages/theme/src/i18n/en/appBar.ts index 62bfc3f938..3a7d78c0ee 100644 --- a/packages/theme/src/i18n/en/appBar.ts +++ b/packages/theme/src/i18n/en/appBar.ts @@ -15,7 +15,6 @@ export const appBar = { hideRightSidebar: "Hide right sidebar", importLayoutFromFile: "Import layout from file…", joinOurSlack: "Join our Slack", - joinSlackCommunity: "Join Slack community", noDataSource: "No data source", open: "Open…", openConnection: "Open connection…", From 70a472611b95ca21f74de84e88119cfe1af64f51 Mon Sep 17 00:00:00 2001 From: Lais Portugal Date: Mon, 15 Apr 2024 09:48:25 +0100 Subject: [PATCH 2/4] Removing unused references of slack menu --- packages/studio-base/src/components/AppBar/AppMenu.tsx | 8 +------- .../studio-base/src/components/AppBar/SettingsMenu.tsx | 4 ---- 2 files changed, 1 insertion(+), 11 deletions(-) diff --git a/packages/studio-base/src/components/AppBar/AppMenu.tsx b/packages/studio-base/src/components/AppBar/AppMenu.tsx index 95d3c83be3..e65b4d01f3 100644 --- a/packages/studio-base/src/components/AppBar/AppMenu.tsx +++ b/packages/studio-base/src/components/AppBar/AppMenu.tsx @@ -189,11 +189,6 @@ export function AppMenu(props: AppMenuProps): JSX.Element { handleNestedMenuClose(); }, [handleNestedMenuClose]); - const onSlackClick = useCallback(() => { - window.open("https://foxglove.dev/slack", "_blank"); - handleNestedMenuClose(); - }, [handleNestedMenuClose]); - const onDemoClick = useCallback(() => { dialogActions.dataSource.open("demo"); handleNestedMenuClose(); @@ -208,13 +203,12 @@ export function AppMenu(props: AppMenuProps): JSX.Element { type: "item", key: "join-slack", label: t("joinOurSlack"), - onClick: onSlackClick, external: true, }, { type: "divider" }, { type: "item", key: "demo", label: t("exploreSampleData"), onClick: onDemoClick }, ], - [onAboutClick, onDemoClick, onDocsClick, onSlackClick, t], + [onAboutClick, onDemoClick, onDocsClick, t], ); return ( diff --git a/packages/studio-base/src/components/AppBar/SettingsMenu.tsx b/packages/studio-base/src/components/AppBar/SettingsMenu.tsx index 9b92a2c242..0bf453f348 100644 --- a/packages/studio-base/src/components/AppBar/SettingsMenu.tsx +++ b/packages/studio-base/src/components/AppBar/SettingsMenu.tsx @@ -56,10 +56,6 @@ export function SettingsMenu({ window.open("https://docs.foxglove.dev/docs", "_blank"); }, []); - const onSlackClick = useCallback(() => { - window.open("https://foxglove.dev/slack", "_blank"); - }, []); - return ( <> Date: Mon, 15 Apr 2024 10:22:53 +0100 Subject: [PATCH 3/4] Additional changes on removing slack links --- .github/ISSUE_TEMPLATE/config.yml | 3 --- packages/studio-base/README.md | 4 ---- 2 files changed, 7 deletions(-) diff --git a/.github/ISSUE_TEMPLATE/config.yml b/.github/ISSUE_TEMPLATE/config.yml index a0a871dfed..12fd3bc1d8 100644 --- a/.github/ISSUE_TEMPLATE/config.yml +++ b/.github/ISSUE_TEMPLATE/config.yml @@ -9,6 +9,3 @@ contact_links: - name: "📚 Stack Exchange" url: https://robotics.stackexchange.com/questions/ask about: Get help from the robotics community - - name: "💬 Live chat" - url: https://foxglove.dev/slack - about: Join the discussion in our Slack community diff --git a/packages/studio-base/README.md b/packages/studio-base/README.md index 4881b3c983..687dfe4334 100644 --- a/packages/studio-base/README.md +++ b/packages/studio-base/README.md @@ -12,7 +12,3 @@ import fuzzyFilter from "@foxglove/studio-base/util/fuzzyFilter"; ``` For a full list of the package's exports, reference its [`index.ts` file](https://github.com/foxglove/studio/blob/main/packages/studio-base/src/index.ts). - -## Stay in touch - -Join us in [Slack](https://foxglove.dev/slack) to ask questions, share feedback, and stay up to date on what our team is working on. From a318d7bef95ffbbbfdc7bcdade3e71631635ee80 Mon Sep 17 00:00:00 2001 From: Lais Portugal Date: Mon, 15 Apr 2024 11:59:01 +0100 Subject: [PATCH 4/4] Removing other mentions of slack channel into the code --- .../src/components/AppBar/AppMenu.tsx | 6 ---- .../src/components/AppBar/HelpMenu.tsx | 29 +-------------- .../src/components/DataSourceDialog/Start.tsx | 36 ------------------- .../src/context/NativeAppMenuContext.ts | 3 +- packages/studio-base/src/i18n/en/appBar.ts | 1 - .../studio-base/src/i18n/en/openDialog.ts | 4 --- packages/studio-desktop/src/common/types.ts | 5 ++- .../studio-desktop/src/main/StudioWindow.ts | 6 ---- packages/studio/README.md | 4 --- packages/theme/src/i18n/en/appBar.ts | 1 - packages/theme/src/i18n/en/openDialog.ts | 4 --- 11 files changed, 4 insertions(+), 95 deletions(-) diff --git a/packages/studio-base/src/components/AppBar/AppMenu.tsx b/packages/studio-base/src/components/AppBar/AppMenu.tsx index e65b4d01f3..09e1b71397 100644 --- a/packages/studio-base/src/components/AppBar/AppMenu.tsx +++ b/packages/studio-base/src/components/AppBar/AppMenu.tsx @@ -199,12 +199,6 @@ export function AppMenu(props: AppMenuProps): JSX.Element { { type: "item", key: "about", label: t("about"), onClick: onAboutClick }, { type: "divider" }, { type: "item", key: "docs", label: t("viewOurDocs"), onClick: onDocsClick, external: true }, - { - type: "item", - key: "join-slack", - label: t("joinOurSlack"), - external: true, - }, { type: "divider" }, { type: "item", key: "demo", label: t("exploreSampleData"), onClick: onDemoClick }, ], diff --git a/packages/studio-base/src/components/AppBar/HelpMenu.tsx b/packages/studio-base/src/components/AppBar/HelpMenu.tsx index 99fd964626..0366149fc8 100644 --- a/packages/studio-base/src/components/AppBar/HelpMenu.tsx +++ b/packages/studio-base/src/components/AppBar/HelpMenu.tsx @@ -2,13 +2,8 @@ // License, v2.0. If a copy of the MPL was not distributed with this // file, You can obtain one at http://mozilla.org/MPL/2.0/ +import { Cloud24Regular, SlideLayout24Regular } from "@fluentui/react-icons"; import { - ChatBubblesQuestion24Regular, - Cloud24Regular, - SlideLayout24Regular, -} from "@fluentui/react-icons"; -import { - Divider, ListItemText, ListSubheader, Menu, @@ -127,28 +122,6 @@ export function HelpMenu(props: HelpMenuProps): JSX.Element { secondaryTypographyProps={{ className: classes.menuText }} /> - - Community - { - void analytics.logEvent(AppEvent.HELP_MENU_CLICK_CTA, { - user: currentUserType, - cta: "join-slack", - }); - handleClose(); - }} - > - - - ); } diff --git a/packages/studio-base/src/components/DataSourceDialog/Start.tsx b/packages/studio-base/src/components/DataSourceDialog/Start.tsx index 2b94601123..4d42dde21d 100644 --- a/packages/studio-base/src/components/DataSourceDialog/Start.tsx +++ b/packages/studio-base/src/components/DataSourceDialog/Start.tsx @@ -207,42 +207,6 @@ function SidebarItems(props: { freeUser: [demoItem], teamOrEnterpriseUser: [ demoItem, - { - id: "join-community", - title: t("joinOurCommunity"), - text: t("joinOurCommunityDescription"), - actions: ( - <> - - - - ), - }, { id: "need-help", title: t("needHelp"), diff --git a/packages/studio-base/src/context/NativeAppMenuContext.ts b/packages/studio-base/src/context/NativeAppMenuContext.ts index 2ccdbaa029..8595e3b564 100644 --- a/packages/studio-base/src/context/NativeAppMenuContext.ts +++ b/packages/studio-base/src/context/NativeAppMenuContext.ts @@ -11,8 +11,7 @@ export type NativeAppMenuEvent = | "open-demo" | "open-help-about" | "open-help-docs" - | "open-help-general" - | "open-help-slack"; + | "open-help-general"; type Handler = () => void; type UnregisterFn = () => void; diff --git a/packages/studio-base/src/i18n/en/appBar.ts b/packages/studio-base/src/i18n/en/appBar.ts index 2b7786e54d..80430289ed 100644 --- a/packages/studio-base/src/i18n/en/appBar.ts +++ b/packages/studio-base/src/i18n/en/appBar.ts @@ -14,7 +14,6 @@ export const appBar = { hideLeftSidebar: "Hide left sidebar", hideRightSidebar: "Hide right sidebar", importLayoutFromFile: "Import layout from file…", - joinOurSlack: "Join our Slack", noDataSource: "No data source", open: "Open…", openConnection: "Open connection…", diff --git a/packages/studio-base/src/i18n/en/openDialog.ts b/packages/studio-base/src/i18n/en/openDialog.ts index fe8db8e43b..e2cbc20393 100644 --- a/packages/studio-base/src/i18n/en/openDialog.ts +++ b/packages/studio-base/src/i18n/en/openDialog.ts @@ -9,10 +9,6 @@ export const openDialog = { "Use a convenient web interface to tag, search, and retrieve data at lightning speed", createAFreeAccount: "Create a free account", exploreSampleData: "Explore sample data", - joinOurCommunity: "Join our community", - joinOurCommunityDescription: - "Join us on Slack or GitHub to get help, make feature requests, and report bugs.", - joinOurSlack: "Join our Slack", learnMore: "Learn more", needHelp: "Need help?", needHelpDescription: "View our documentation, or check out the tutorials on the Foxglove blog.", diff --git a/packages/studio-desktop/src/common/types.ts b/packages/studio-desktop/src/common/types.ts index 578be59526..f283c2c382 100644 --- a/packages/studio-desktop/src/common/types.ts +++ b/packages/studio-desktop/src/common/types.ts @@ -10,8 +10,7 @@ export type ForwardedMenuEvent = | "open-demo" | "open-help-about" | "open-help-docs" - | "open-help-general" - | "open-help-slack"; + | "open-help-general"; export type ForwardedWindowEvent = | "enter-full-screen" @@ -113,4 +112,4 @@ interface Desktop { updateLanguage(): void; } -export type { NativeMenuBridge, Storage, StorageContent, Desktop, DesktopExtension }; +export type { Desktop, DesktopExtension, NativeMenuBridge, Storage, StorageContent }; diff --git a/packages/studio-desktop/src/main/StudioWindow.ts b/packages/studio-desktop/src/main/StudioWindow.ts index 885c27523c..42b044db6d 100644 --- a/packages/studio-desktop/src/main/StudioWindow.ts +++ b/packages/studio-desktop/src/main/StudioWindow.ts @@ -368,12 +368,6 @@ function buildMenu(browserWindow: BrowserWindow): Menu { sendNativeAppMenuEvent("open-help-docs", browserWindow); }, }, - { - label: t("appBar:joinOurSlack"), - click: () => { - sendNativeAppMenuEvent("open-help-slack", browserWindow); - }, - }, { type: "separator" }, { label: t("appBar:exploreSampleData"), diff --git a/packages/studio/README.md b/packages/studio/README.md index afe5574b19..be36896b5b 100644 --- a/packages/studio/README.md +++ b/packages/studio/README.md @@ -3,7 +3,3 @@ This package contains type definitions for writing [Foxbox](https://foxglove.dev/) extensions. See https://docs.foxglove.dev/docs/visualization/extensions/introduction - -## Stay in touch - -Join us in [Slack](https://foxglove.dev/slack) to ask questions, share feedback, and stay up to date on what our team is working on. diff --git a/packages/theme/src/i18n/en/appBar.ts b/packages/theme/src/i18n/en/appBar.ts index 3a7d78c0ee..7bebf3afe4 100644 --- a/packages/theme/src/i18n/en/appBar.ts +++ b/packages/theme/src/i18n/en/appBar.ts @@ -14,7 +14,6 @@ export const appBar = { hideLeftSidebar: "Hide left sidebar", hideRightSidebar: "Hide right sidebar", importLayoutFromFile: "Import layout from file…", - joinOurSlack: "Join our Slack", noDataSource: "No data source", open: "Open…", openConnection: "Open connection…", diff --git a/packages/theme/src/i18n/en/openDialog.ts b/packages/theme/src/i18n/en/openDialog.ts index 902ac8e1e2..8b8709854f 100644 --- a/packages/theme/src/i18n/en/openDialog.ts +++ b/packages/theme/src/i18n/en/openDialog.ts @@ -9,10 +9,6 @@ export const openDialog = { "Use a convenient web interface to tag, search, and retrieve data at lightning speed", createAFreeAccount: "Create a free account", exploreSampleData: "Explore sample data", - joinOurCommunity: "Join our community", - joinOurCommunityDescription: - "Join us on Slack or GitHub to get help, make feature requests, and report bugs.", - joinOurSlack: "Join our Slack", learnMore: "Learn more", needHelp: "Need help?", needHelpDescription: "View our documentation, or check out the tutorials on the Foxglove blog.",