Skip to content
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
23 commits
Select commit Hold shift + click to select a range
b4a0e12
add toolbox steps
EdwardAngert May 2, 2025
00b0249
Merge branch 'main' into 16883-jetbrains-toolbox
EdwardAngert May 8, 2025
40d68ec
fix: persist terraform modules during template import (#17665)
aslilac May 8, 2025
94c9d4c
fix: revert fix: persist terraform modules during template import (#1…
sreya May 9, 2025
c90608d
chore: add prebuild docs (#17580)
dannykopping May 9, 2025
817ec87
fix: fixed flaking VPN tunnel tests & bump coder/quartz to 0.1.3 (#17…
ibetitsmike May 9, 2025
77abfea
chore: extract app access logic for reuse (#17724)
BrunoQuaresma May 9, 2025
705ae40
chore: add keys for each app on workspaces table (#17726)
BrunoQuaresma May 9, 2025
2de22f9
refactor: improve apps.ts readbility (#17741)
BrunoQuaresma May 9, 2025
28a00de
chore: fix :first-child warning (#17727)
BrunoQuaresma May 9, 2025
2a9608c
chore: replace MUI icons - 1 (#17731)
BrunoQuaresma May 9, 2025
2df2161
chore: upgrade `terraform-provider-coder` & `preview` libs (#17738)
dannykopping May 9, 2025
eef1655
docs: clarify parameter autofill documentation (#17728)
EdwardAngert May 9, 2025
e05cafe
refactor: add safe list for external app protocols (#17742)
BrunoQuaresma May 9, 2025
2058980
chore: replace MUI icons - 2 (#17732)
BrunoQuaresma May 9, 2025
576eb8a
chore: replace MUI icons - 3 (#17733)
BrunoQuaresma May 9, 2025
34846f4
move toolbox to separate doc
EdwardAngert May 9, 2025
e178e47
fix parameters; require token
EdwardAngert May 9, 2025
006780c
Merge branch 'main' into 16883-jetbrains-toolbox
EdwardAngert May 12, 2025
f6473dd
fix link
EdwardAngert May 12, 2025
e401225
Merge branch 'main' into 16883-jetbrains-toolbox
matifali May 20, 2025
0bd8bfe
prereqs and internal certs
EdwardAngert May 21, 2025
1c41df3
Merge branch 'main' into 16883-jetbrains-toolbox
EdwardAngert May 21, 2025
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
chore: replace MUI icons - 1 (#17731)
1. Replaced MUI StopOutlined with Lucide SquareIcon in:
    - workspace.tsx
    - WorkspacesPageView.tsx
    - BuildIcon.tsx
    
 2. Replaced MUI PlayArrowOutlined with Lucide PlayIcon in:
    - workspace.tsx
    - WorkspacesPageView.tsx
    - BuildIcon.tsx
    
 3. Replaced MUI DeleteOutlined with Lucide TrashIcon in:
    - WorkspacesPageView.tsx
    - WorkspaceActions.tsx
    - TemplatePageHeader.tsx
    - BuildIcon.tsx
  • Loading branch information
BrunoQuaresma authored and EdwardAngert committed May 9, 2025
commit 2a9608c19f26df1a35dfeb9b5481ec8ef63f5832
12 changes: 5 additions & 7 deletions site/src/components/BuildIcon/BuildIcon.tsx
Original file line number Diff line number Diff line change
@@ -1,17 +1,15 @@
import DeleteOutlined from "@mui/icons-material/DeleteOutlined";
import PlayArrowOutlined from "@mui/icons-material/PlayArrowOutlined";
import StopOutlined from "@mui/icons-material/StopOutlined";
import type { WorkspaceTransition } from "api/typesGenerated";
import { PlayIcon, SquareIcon, TrashIcon } from "lucide-react";
import type { ComponentProps } from "react";

type SVGIcon = typeof PlayArrowOutlined;
type SVGIcon = typeof PlayIcon;

type SVGIconProps = ComponentProps<SVGIcon>;

const iconByTransition: Record<WorkspaceTransition, SVGIcon> = {
start: PlayArrowOutlined,
stop: StopOutlined,
delete: DeleteOutlined,
start: PlayIcon,
stop: SquareIcon,
delete: TrashIcon,
};

export const BuildIcon = (
Expand Down
4 changes: 2 additions & 2 deletions site/src/pages/TemplatePage/TemplatePageHeader.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
import AddIcon from "@mui/icons-material/AddOutlined";
import DeleteIcon from "@mui/icons-material/DeleteOutlined";
import EditIcon from "@mui/icons-material/EditOutlined";
import CopyIcon from "@mui/icons-material/FileCopyOutlined";
import SettingsIcon from "@mui/icons-material/SettingsOutlined";
Expand Down Expand Up @@ -30,6 +29,7 @@ import {
} from "components/PageHeader/PageHeader";
import { Pill } from "components/Pill/Pill";
import { Stack } from "components/Stack/Stack";
import { TrashIcon } from "lucide-react";
import { EllipsisVertical } from "lucide-react";
import { linkToTemplate, useLinks } from "modules/navigation";
import type { WorkspacePermissions } from "modules/permissions/workspaces";
Expand Down Expand Up @@ -105,7 +105,7 @@ const TemplateMenu: FC<TemplateMenuProps> = ({
className="text-content-destructive focus:text-content-destructive"
onClick={dialogState.openDeleteConfirmation}
>
<DeleteIcon />
<TrashIcon />
Delete&hellip;
</DropdownMenuItem>
</DropdownMenuContent>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
import DeleteIcon from "@mui/icons-material/DeleteOutlined";
import DownloadOutlined from "@mui/icons-material/DownloadOutlined";
import DuplicateIcon from "@mui/icons-material/FileCopyOutlined";
import HistoryIcon from "@mui/icons-material/HistoryOutlined";
Expand All @@ -13,6 +12,7 @@ import {
DropdownMenuTrigger,
} from "components/DropdownMenu/DropdownMenu";
import { useAuthenticated } from "hooks/useAuthenticated";
import { TrashIcon } from "lucide-react";
import { EllipsisVertical } from "lucide-react";
import {
type ActionType,
Expand Down Expand Up @@ -227,7 +227,7 @@ export const WorkspaceActions: FC<WorkspaceActionsProps> = ({
onClick={handleDelete}
data-testid="delete-button"
>
<DeleteIcon />
<TrashIcon />
Delete&hellip;
</DropdownMenuItem>
</DropdownMenuContent>
Expand Down
10 changes: 4 additions & 6 deletions site/src/pages/WorkspacesPage/WorkspacesPageView.tsx
Original file line number Diff line number Diff line change
@@ -1,8 +1,5 @@
import CloudQueue from "@mui/icons-material/CloudQueue";
import DeleteOutlined from "@mui/icons-material/DeleteOutlined";
import KeyboardArrowDownOutlined from "@mui/icons-material/KeyboardArrowDownOutlined";
import PlayArrowOutlined from "@mui/icons-material/PlayArrowOutlined";
import StopOutlined from "@mui/icons-material/StopOutlined";
import LoadingButton from "@mui/lab/LoadingButton";
import { hasError, isApiValidationError } from "api/errors";
import type { Template, Workspace } from "api/typesGenerated";
Expand All @@ -22,6 +19,7 @@ import { PaginationHeader } from "components/PaginationWidget/PaginationHeader";
import { PaginationWidgetBase } from "components/PaginationWidget/PaginationWidgetBase";
import { Stack } from "components/Stack/Stack";
import { TableToolbar } from "components/TableToolbar/TableToolbar";
import { PlayIcon, SquareIcon, TrashIcon } from "lucide-react";
import { WorkspacesTable } from "pages/WorkspacesPage/WorkspacesTable";
import type { FC } from "react";
import type { UseQueryResult } from "react-query";
Expand Down Expand Up @@ -160,7 +158,7 @@ export const WorkspacesPageView: FC<WorkspacesPageViewProps> = ({
}
onClick={onStartAll}
>
<PlayArrowOutlined /> Start
<PlayIcon /> Start
</DropdownMenuItem>
<DropdownMenuItem
disabled={
Expand All @@ -170,7 +168,7 @@ export const WorkspacesPageView: FC<WorkspacesPageViewProps> = ({
}
onClick={onStopAll}
>
<StopOutlined /> Stop
<SquareIcon /> Stop
</DropdownMenuItem>
<DropdownMenuSeparator />
<DropdownMenuItem onClick={onUpdateAll}>
Expand All @@ -180,7 +178,7 @@ export const WorkspacesPageView: FC<WorkspacesPageViewProps> = ({
className="text-content-destructive focus:text-content-destructive"
onClick={onDeleteAll}
>
<DeleteOutlined /> Delete&hellip;
<TrashIcon /> Delete&hellip;
</DropdownMenuItem>
</DropdownMenuContent>
</DropdownMenu>
Expand Down
5 changes: 2 additions & 3 deletions site/src/utils/workspace.tsx
Original file line number Diff line number Diff line change
@@ -1,14 +1,13 @@
import type { Theme } from "@emotion/react";
import ErrorIcon from "@mui/icons-material/ErrorOutline";
import QueuedIcon from "@mui/icons-material/HourglassEmpty";
import PlayIcon from "@mui/icons-material/PlayArrowOutlined";
import StopIcon from "@mui/icons-material/StopOutlined";
import type * as TypesGen from "api/typesGenerated";
import { PillSpinner } from "components/Pill/Pill";
import dayjs from "dayjs";
import duration from "dayjs/plugin/duration";
import minMax from "dayjs/plugin/minMax";
import utc from "dayjs/plugin/utc";
import { PlayIcon, SquareIcon } from "lucide-react";
import semver from "semver";
import { getPendingStatusLabel } from "./provisionerJob";

Expand Down Expand Up @@ -215,7 +214,7 @@ export const getDisplayWorkspaceStatus = (
return {
type: "inactive",
text: "Stopped",
icon: <StopIcon />,
icon: <SquareIcon />,
} as const;
case "deleting":
return {
Expand Down