diff --git a/apps/desktop/src/main/lib/menu.ts b/apps/desktop/src/main/lib/menu.ts index 89befce434e..1e24d4150de 100644 --- a/apps/desktop/src/main/lib/menu.ts +++ b/apps/desktop/src/main/lib/menu.ts @@ -80,6 +80,13 @@ export function createApplicationMenu() { { label: "Help", submenu: [ + { + label: "Documentation", + click: () => { + shell.openExternal(COMPANY.DOCS_URL); + }, + }, + { type: "separator" }, { label: "Contact Us", click: () => { diff --git a/apps/desktop/src/renderer/routes/_authenticated/_dashboard/components/TopBar/components/OrganizationDropdown/OrganizationDropdown.tsx b/apps/desktop/src/renderer/routes/_authenticated/_dashboard/components/TopBar/components/OrganizationDropdown/OrganizationDropdown.tsx index 6c8e6fb147a..bc3a8441351 100644 --- a/apps/desktop/src/renderer/routes/_authenticated/_dashboard/components/TopBar/components/OrganizationDropdown/OrganizationDropdown.tsx +++ b/apps/desktop/src/renderer/routes/_authenticated/_dashboard/components/TopBar/components/OrganizationDropdown/OrganizationDropdown.tsx @@ -14,17 +14,19 @@ import { } from "@superset/ui/dropdown-menu"; import { useLiveQuery } from "@tanstack/react-db"; import { useNavigate } from "@tanstack/react-router"; -import { FaDiscord, FaXTwitter } from "react-icons/fa6"; +import { FaDiscord, FaGithub, FaXTwitter } from "react-icons/fa6"; +import { FiUsers } from "react-icons/fi"; import { HiCheck, HiChevronUpDown, HiOutlineArrowRightOnRectangle, - HiOutlineBugAnt, + HiOutlineBookOpen, + HiOutlineChatBubbleLeftRight, HiOutlineCog6Tooth, HiOutlineEnvelope, - HiOutlineUserGroup, } from "react-icons/hi2"; -import { LuKeyboard, LuLifeBuoy } from "react-icons/lu"; +import { IoBugOutline } from "react-icons/io5"; +import { LuKeyboard } from "react-icons/lu"; import { authClient } from "renderer/lib/auth-client"; import { electronTrpc } from "renderer/lib/electron-trpc"; import { useCollections } from "renderer/routes/_authenticated/providers/CollectionsProvider"; @@ -92,6 +94,7 @@ export function OrganizationDropdown() { + {/* Organization */} navigate({ to: "/settings/account" })} > @@ -101,57 +104,51 @@ export function OrganizationDropdown() { {settingsHotkey} )} - navigate({ to: "/settings/organization" })} > - - Invite and manage members + + Manage members - - - {organizations && organizations.length > 1 && ( - <> - - - Switch organization - - - {userEmail && ( - - {userEmail} - - )} - {organizations.map((organization) => ( - switchOrganization(organization.id)} - className="gap-2" - > - - {organization.name} - {organization.id === activeOrganization?.id && ( - - )} - - ))} - - - - + + + Switch organization + + + {userEmail && ( + + {userEmail} + + )} + {organizations.map((organization) => ( + switchOrganization(organization.id)} + className="gap-2" + > + + {organization.name} + {organization.id === activeOrganization?.id && ( + + )} + + ))} + + )} - openExternal(COMPANY.REPORT_ISSUE_URL)} - > - - Report Issue + + + {/* Help & Support */} + openExternal(COMPANY.DOCS_URL)}> + + Documentation navigate({ to: "/settings/keyboard" })} @@ -162,12 +159,22 @@ export function OrganizationDropdown() { {shortcutsHotkey} )} + openExternal(COMPANY.REPORT_ISSUE_URL)} + > + + Report Issue + - + Contact Us + openExternal(COMPANY.GITHUB_URL)}> + + GitHub + openExternal(COMPANY.DISCORD_URL)}> Discord @@ -184,6 +191,7 @@ export function OrganizationDropdown() { + {/* Account */} Log out diff --git a/apps/desktop/src/renderer/routes/_authenticated/settings/api-keys/components/ApiKeysSettings/ApiKeysSettings.tsx b/apps/desktop/src/renderer/routes/_authenticated/settings/api-keys/components/ApiKeysSettings/ApiKeysSettings.tsx index 69f23f26cf1..894a985db80 100644 --- a/apps/desktop/src/renderer/routes/_authenticated/settings/api-keys/components/ApiKeysSettings/ApiKeysSettings.tsx +++ b/apps/desktop/src/renderer/routes/_authenticated/settings/api-keys/components/ApiKeysSettings/ApiKeysSettings.tsx @@ -1,3 +1,4 @@ +import { COMPANY } from "@superset/shared/constants"; import { alert } from "@superset/ui/atoms/Alert"; import { Badge } from "@superset/ui/badge"; import { Button } from "@superset/ui/button"; @@ -24,6 +25,7 @@ import { import { useLiveQuery } from "@tanstack/react-db"; import { useState } from "react"; import { + HiArrowTopRightOnSquare, HiOutlineClipboardDocument, HiOutlineKey, HiOutlinePlus, @@ -119,7 +121,16 @@ export function ApiKeysSettings({ visibleItems }: ApiKeysSettingsProps) {

API Keys

- Manage API keys for MCP server access and external integrations + Manage API keys for MCP server access and external integrations.{" "} + + Learn more + +

diff --git a/apps/desktop/src/renderer/routes/_authenticated/settings/components/SettingsSidebar/SettingsSidebar.tsx b/apps/desktop/src/renderer/routes/_authenticated/settings/components/SettingsSidebar/SettingsSidebar.tsx index 5fe7217ab72..1d7f4496b0a 100644 --- a/apps/desktop/src/renderer/routes/_authenticated/settings/components/SettingsSidebar/SettingsSidebar.tsx +++ b/apps/desktop/src/renderer/routes/_authenticated/settings/components/SettingsSidebar/SettingsSidebar.tsx @@ -1,5 +1,11 @@ +import { COMPANY } from "@superset/shared/constants"; import { Link } from "@tanstack/react-router"; -import { HiArrowLeft, HiMagnifyingGlass, HiXMark } from "react-icons/hi2"; +import { + HiArrowLeft, + HiArrowTopRightOnSquare, + HiMagnifyingGlass, + HiXMark, +} from "react-icons/hi2"; import { useSetSettingsSearchQuery, useSettingsSearchQuery, @@ -52,6 +58,18 @@ export function SettingsSidebar() { + + ); } diff --git a/apps/desktop/src/renderer/routes/_authenticated/settings/integrations/components/IntegrationsSettings/IntegrationsSettings.tsx b/apps/desktop/src/renderer/routes/_authenticated/settings/integrations/components/IntegrationsSettings/IntegrationsSettings.tsx index 558e6b206d8..60f264679ac 100644 --- a/apps/desktop/src/renderer/routes/_authenticated/settings/integrations/components/IntegrationsSettings/IntegrationsSettings.tsx +++ b/apps/desktop/src/renderer/routes/_authenticated/settings/integrations/components/IntegrationsSettings/IntegrationsSettings.tsx @@ -1,4 +1,4 @@ -import { FEATURE_FLAGS } from "@superset/shared/constants"; +import { COMPANY, FEATURE_FLAGS } from "@superset/shared/constants"; import { Badge } from "@superset/ui/badge"; import { Button } from "@superset/ui/button"; import { @@ -189,7 +189,16 @@ export function IntegrationsSettings({

- Manage integrations in the web app to connect and configure services. + Manage integrations in the web app to connect and configure services.{" "} + + Learn more + +

);