From e40229d5b7e63bdd84a63230e013b72d4c8ca31d Mon Sep 17 00:00:00 2001 From: BrunoQuaresma Date: Tue, 20 May 2025 21:43:41 +0000 Subject: [PATCH 1/2] chore: chore: replace MUI icons with Lucide icons - 18 --- .../WorkspaceAppStatus/WorkspaceAppStatus.tsx | 18 +++++++++--------- site/src/pages/ChatPage/ChatToolInvocation.tsx | 4 ++-- site/src/pages/HealthPage/DERPRegionPage.tsx | 6 ++++-- .../pages/HealthPage/WorkspaceProxyPage.tsx | 6 ++++-- .../UserTable/EditRolesButton.tsx | 2 +- .../UsersPage/UsersTable/UsersTableBody.tsx | 4 ++-- site/src/pages/WorkspacePage/AppStatuses.tsx | 11 +++++++---- 7 files changed, 29 insertions(+), 22 deletions(-) diff --git a/site/src/modules/workspaces/WorkspaceAppStatus/WorkspaceAppStatus.tsx b/site/src/modules/workspaces/WorkspaceAppStatus/WorkspaceAppStatus.tsx index 412df60d9203e..339c09a5f829d 100644 --- a/site/src/modules/workspaces/WorkspaceAppStatus/WorkspaceAppStatus.tsx +++ b/site/src/modules/workspaces/WorkspaceAppStatus/WorkspaceAppStatus.tsx @@ -1,9 +1,7 @@ import type { Theme } from "@emotion/react"; import { useTheme } from "@emotion/react"; -import AppsIcon from "@mui/icons-material/Apps"; import CheckCircle from "@mui/icons-material/CheckCircle"; import ErrorIcon from "@mui/icons-material/Error"; -import InsertDriveFile from "@mui/icons-material/InsertDriveFile"; import Warning from "@mui/icons-material/Warning"; import CircularProgress from "@mui/material/CircularProgress"; import type { @@ -12,6 +10,8 @@ import type { WorkspaceAgent, WorkspaceApp, } from "api/typesGenerated"; +import { LayoutGridIcon } from "lucide-react"; +import { FileIcon } from "lucide-react"; import { ExternalLinkIcon } from "lucide-react"; import { useAppLink } from "modules/apps/useAppLink"; import type { FC } from "react"; @@ -163,11 +163,11 @@ export const WorkspaceAppStatus = ({ ...commonStyles, }} > - {formatURI(status.uri)} @@ -262,9 +262,9 @@ const AppLink: FC = ({ app, workspace, agent }) => { }} /> ) : ( - diff --git a/site/src/pages/ChatPage/ChatToolInvocation.tsx b/site/src/pages/ChatPage/ChatToolInvocation.tsx index 6f418edabb4a5..acafc42ab810b 100644 --- a/site/src/pages/ChatPage/ChatToolInvocation.tsx +++ b/site/src/pages/ChatPage/ChatToolInvocation.tsx @@ -4,7 +4,6 @@ import ArticleIcon from "@mui/icons-material/Article"; import BuildIcon from "@mui/icons-material/Build"; import CheckCircle from "@mui/icons-material/CheckCircle"; import CodeIcon from "@mui/icons-material/Code"; -import DeleteIcon from "@mui/icons-material/Delete"; import ErrorIcon from "@mui/icons-material/Error"; import FileUploadIcon from "@mui/icons-material/FileUpload"; import PersonIcon from "@mui/icons-material/Person"; @@ -13,6 +12,7 @@ import CircularProgress from "@mui/material/CircularProgress"; import Tooltip from "@mui/material/Tooltip"; import type * as TypesGen from "api/typesGenerated"; import { Avatar } from "components/Avatar/Avatar"; +import { TrashIcon } from "lucide-react"; import { InfoIcon } from "lucide-react"; import type React from "react"; import { type FC, memo, useMemo, useState } from "react"; @@ -533,7 +533,7 @@ const ChatToolInvocationResultPreview: FC<{ color: theme.palette.text.secondary, }} > - + {toolInvocation.result} ); diff --git a/site/src/pages/HealthPage/DERPRegionPage.tsx b/site/src/pages/HealthPage/DERPRegionPage.tsx index 5bb190fd1e4b1..c16789fac82b0 100644 --- a/site/src/pages/HealthPage/DERPRegionPage.tsx +++ b/site/src/pages/HealthPage/DERPRegionPage.tsx @@ -1,5 +1,4 @@ import { type Interpolation, type Theme, useTheme } from "@emotion/react"; -import TagOutlined from "@mui/icons-material/TagOutlined"; import Tooltip from "@mui/material/Tooltip"; import type { DERPNodeReport, @@ -9,6 +8,7 @@ import type { HealthcheckReport, } from "api/typesGenerated"; import { Alert } from "components/Alert/Alert"; +import { TagIcon } from "lucide-react"; import { ChevronLeftIcon } from "lucide-react"; import { CodeIcon } from "lucide-react"; import type { FC } from "react"; @@ -92,7 +92,9 @@ const DERPRegionPage: FC = () => {
- }>{region!.RegionID} + }> + {region!.RegionID} + }> diff --git a/site/src/pages/HealthPage/WorkspaceProxyPage.tsx b/site/src/pages/HealthPage/WorkspaceProxyPage.tsx index 030d849fd338b..3ab2b860a6e75 100644 --- a/site/src/pages/HealthPage/WorkspaceProxyPage.tsx +++ b/site/src/pages/HealthPage/WorkspaceProxyPage.tsx @@ -1,9 +1,9 @@ import { useTheme } from "@emotion/react"; import PublicOutlined from "@mui/icons-material/PublicOutlined"; -import TagOutlined from "@mui/icons-material/TagOutlined"; import Tooltip from "@mui/material/Tooltip"; import type { HealthcheckReport } from "api/typesGenerated"; import { Alert } from "components/Alert/Alert"; +import { TagIcon } from "lucide-react"; import type { FC } from "react"; import { Helmet } from "react-helmet-async"; import { useOutletContext } from "react-router-dom"; @@ -118,7 +118,9 @@ const WorkspaceProxyPage: FC = () => { )} {region.version && ( - }>{region.version} + }> + {region.version} + )} {region.derp_enabled && ( diff --git a/site/src/pages/OrganizationSettingsPage/UserTable/EditRolesButton.tsx b/site/src/pages/OrganizationSettingsPage/UserTable/EditRolesButton.tsx index 383f8dc80d099..74618bf9701bc 100644 --- a/site/src/pages/OrganizationSettingsPage/UserTable/EditRolesButton.tsx +++ b/site/src/pages/OrganizationSettingsPage/UserTable/EditRolesButton.tsx @@ -1,4 +1,3 @@ -import UserIcon from "@mui/icons-material/PersonOutline"; import Checkbox from "@mui/material/Checkbox"; import Tooltip from "@mui/material/Tooltip"; import type { SlimRole } from "api/typesGenerated"; @@ -17,6 +16,7 @@ import { PopoverContent, PopoverTrigger, } from "components/deprecated/Popover/Popover"; +import { UserIcon } from "lucide-react"; import { type FC, useEffect, useState } from "react"; const roleDescriptions: Record = { diff --git a/site/src/pages/UsersPage/UsersTable/UsersTableBody.tsx b/site/src/pages/UsersPage/UsersTable/UsersTableBody.tsx index d473e2be95fe6..894a75daef78a 100644 --- a/site/src/pages/UsersPage/UsersTable/UsersTableBody.tsx +++ b/site/src/pages/UsersPage/UsersTable/UsersTableBody.tsx @@ -1,5 +1,4 @@ import type { Interpolation, Theme } from "@emotion/react"; -import DeleteIcon from "@mui/icons-material/Delete"; import GitHub from "@mui/icons-material/GitHub"; import HideSourceOutlined from "@mui/icons-material/HideSourceOutlined"; import KeyOutlined from "@mui/icons-material/KeyOutlined"; @@ -29,6 +28,7 @@ import { } from "components/TableLoader/TableLoader"; import dayjs from "dayjs"; import relativeTime from "dayjs/plugin/relativeTime"; +import { TrashIcon } from "lucide-react"; import { EllipsisVertical } from "lucide-react"; import type { FC } from "react"; import { UserRoleCell } from "../../OrganizationSettingsPage/UserTable/UserRoleCell"; @@ -236,7 +236,7 @@ export const UsersTableBody: FC = ({ onClick={() => onDeleteUser(user)} disabled={user.id === actorID} > - + Delete… diff --git a/site/src/pages/WorkspacePage/AppStatuses.tsx b/site/src/pages/WorkspacePage/AppStatuses.tsx index 60e4a8cecf22e..b44ef0f346300 100644 --- a/site/src/pages/WorkspacePage/AppStatuses.tsx +++ b/site/src/pages/WorkspacePage/AppStatuses.tsx @@ -1,9 +1,7 @@ import type { Theme } from "@emotion/react"; import { useTheme } from "@emotion/react"; -import AppsIcon from "@mui/icons-material/Apps"; import CheckCircle from "@mui/icons-material/CheckCircle"; import ErrorIcon from "@mui/icons-material/Error"; -import InsertDriveFile from "@mui/icons-material/InsertDriveFile"; import Warning from "@mui/icons-material/Warning"; import CircularProgress from "@mui/material/CircularProgress"; import Link from "@mui/material/Link"; @@ -15,6 +13,8 @@ import type { WorkspaceApp, } from "api/typesGenerated"; import { formatDistance, formatDistanceToNow } from "date-fns"; +import { LayoutGridIcon } from "lucide-react"; +import { FileIcon } from "lucide-react"; import { ExternalLinkIcon } from "lucide-react"; import { HourglassIcon } from "lucide-react"; import { CircleHelpIcon } from "lucide-react"; @@ -287,7 +287,10 @@ export const AppStatuses: FC = ({ }, }} > - + {formatURI(status.uri)}
@@ -397,7 +400,7 @@ const AppLink: FC = ({ app, agent, workspace }) => { style={{ borderRadius: "3px" }} /> ) : ( - + )} {/* Keep app name short */} Date: Wed, 21 May 2025 18:56:34 +0000 Subject: [PATCH 2/2] Fix icons --- site/src/pages/HealthPage/DERPRegionPage.tsx | 6 ++---- site/src/pages/HealthPage/WorkspaceProxyPage.tsx | 4 ++-- .../OrganizationSettingsPage/UserTable/EditRolesButton.tsx | 2 +- 3 files changed, 5 insertions(+), 7 deletions(-) diff --git a/site/src/pages/HealthPage/DERPRegionPage.tsx b/site/src/pages/HealthPage/DERPRegionPage.tsx index c16789fac82b0..afdc34d43cf66 100644 --- a/site/src/pages/HealthPage/DERPRegionPage.tsx +++ b/site/src/pages/HealthPage/DERPRegionPage.tsx @@ -8,9 +8,7 @@ import type { HealthcheckReport, } from "api/typesGenerated"; import { Alert } from "components/Alert/Alert"; -import { TagIcon } from "lucide-react"; -import { ChevronLeftIcon } from "lucide-react"; -import { CodeIcon } from "lucide-react"; +import { ChevronLeftIcon, CodeIcon, HashIcon } from "lucide-react"; import type { FC } from "react"; import { Helmet } from "react-helmet-async"; import { Link, useOutletContext, useParams } from "react-router-dom"; @@ -92,7 +90,7 @@ const DERPRegionPage: FC = () => {
- }> + }> {region!.RegionID} diff --git a/site/src/pages/HealthPage/WorkspaceProxyPage.tsx b/site/src/pages/HealthPage/WorkspaceProxyPage.tsx index 3ab2b860a6e75..f37b2721eb4b1 100644 --- a/site/src/pages/HealthPage/WorkspaceProxyPage.tsx +++ b/site/src/pages/HealthPage/WorkspaceProxyPage.tsx @@ -3,7 +3,7 @@ import PublicOutlined from "@mui/icons-material/PublicOutlined"; import Tooltip from "@mui/material/Tooltip"; import type { HealthcheckReport } from "api/typesGenerated"; import { Alert } from "components/Alert/Alert"; -import { TagIcon } from "lucide-react"; +import { HashIcon } from "lucide-react"; import type { FC } from "react"; import { Helmet } from "react-helmet-async"; import { useOutletContext } from "react-router-dom"; @@ -118,7 +118,7 @@ const WorkspaceProxyPage: FC = () => { )} {region.version && ( - }> + }> {region.version} diff --git a/site/src/pages/OrganizationSettingsPage/UserTable/EditRolesButton.tsx b/site/src/pages/OrganizationSettingsPage/UserTable/EditRolesButton.tsx index 74618bf9701bc..a6d0d9f283dc3 100644 --- a/site/src/pages/OrganizationSettingsPage/UserTable/EditRolesButton.tsx +++ b/site/src/pages/OrganizationSettingsPage/UserTable/EditRolesButton.tsx @@ -175,7 +175,7 @@ export const EditRolesButton: FC = ({
- +
Member