Skip to content

feat: add organization scope for shared ports #18314

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 27 commits into from
Jun 16, 2025
Merged

feat: add organization scope for shared ports #18314

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
27 commits
Select commit Hold shift + click to select a range
4724f79
claude be doing something certainly
aslilac Jun 10, 2025
408d70d
get claude off its nonsense
aslilac Jun 10, 2025
dfea63d
Revert "get claude off its nonsense"
aslilac Jun 10, 2025
429bc13
let 'er rip some more
aslilac Jun 11, 2025
e04084e
do the thing
aslilac Jun 11, 2025
842c5bb
fix story
aslilac Jun 11, 2025
e9abb74
clean up permission checking
aslilac Jun 11, 2025
a60f072
🧹
aslilac Jun 13, 2025
c26bf27
fmt
aslilac Jun 13, 2025
c10de9e
a test that actually makes any sense
aslilac Jun 13, 2025
bdee7ac
jk
aslilac Jun 13, 2025
29d19a2
tighten, don't loosen
aslilac Jun 13, 2025
d5cbd9a
fix tooltips
aslilac Jun 13, 2025
9bb36ec
move comment
aslilac Jun 13, 2025
089f094
add new sharing level to agent.proto
aslilac Jun 13, 2025
45c8508
Merge branch 'main' into lilac/org-port-sharing
aslilac Jun 13, 2025
e8f031e
why
aslilac Jun 13, 2025
495fbc3
oh my
aslilac Jun 13, 2025
27bccf2
fix migration numbers
aslilac Jun 13, 2025
2da3691
update changelog
aslilac Jun 16, 2025
e21abef
assert default level
aslilac Jun 16, 2025
ae27911
eh, maybe not
aslilac Jun 16, 2025
04872d2
update subagent api
aslilac Jun 16, 2025
f58ae61
Merge branch 'main' into lilac/org-port-sharing
aslilac Jun 16, 2025
ee8d5e3
tweak port number
aslilac Jun 16, 2025
ceb8c76
add missing organization max sharing level option
aslilac Jun 16, 2025
53f9124
add missing map member
aslilac Jun 16, 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
do the thing
  • Loading branch information
@aslilac
aslilac committed Jun 11, 2025
commit e04084eb47ade44d4d16eaeaca84a23065a70de4
1 change: 1 addition & 0 deletions site/src/modules/resources/PortForwardButton.stories.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ const meta: Meta<typeof PortForwardButton> = {
component: PortForwardButton,
decorators: [withDashboardProvider],
args: {
host: "*.coder.com",
agent: MockWorkspaceAgent,
workspace: MockWorkspace,
template: MockTemplate,
Expand Down
49 changes: 32 additions & 17 deletions site/src/modules/resources/PortForwardButton.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@ import MenuItem from "@mui/material/MenuItem";
import Select from "@mui/material/Select";
import Stack from "@mui/material/Stack";
import TextField from "@mui/material/TextField";
import MUITooltip from "@mui/material/Tooltip";
import { API } from "api/api";
import {
deleteWorkspacePortShare,
Expand Down Expand Up @@ -223,25 +222,41 @@ export const PortForwardPopoverView: FC<PortForwardPopoverViewProps> = ({
})();

const disabledPublicMenuItem = (
<MUITooltip title="This workspace template does not allow sharing ports with unauthenticated users.">
{/* Tooltips don't work directly on disabled MenuItem components so you must wrap in div. */}
<div>
<MenuItem value="public" disabled>
Public
</MenuItem>
</div>
</MUITooltip>
<TooltipProvider>
<Tooltip>
<TooltipTrigger asChild>
{/* Tooltips don't work directly on disabled MenuItem components so you must wrap in div. */}
<div>
<MenuItem value="public" disabled>
Public
</MenuItem>
</div>
</TooltipTrigger>
<TooltipContent>
This workspace template does not allow sharing ports with
unauthenticated users.
</TooltipContent>
</Tooltip>
</TooltipProvider>
);

const disabledOrganizationMenuItem = (
<MUITooltip title="This workspace template does not allow sharing ports at the organization level.">
{/* Tooltips don't work directly on disabled MenuItem components so you must wrap in div. */}
<div>
<MenuItem value="organization" disabled>
Organization
</MenuItem>
</div>
</MUITooltip>
<TooltipProvider>
<Tooltip>
<TooltipTrigger asChild>
{/* Tooltips don't work directly on disabled MenuItem components so you must wrap in div. */}
<div>
<MenuItem value="organization" disabled>
Organization
</MenuItem>
</div>
</TooltipTrigger>
<TooltipContent>
This workspace template does not allow sharing ports at the
organization level.
</TooltipContent>
</Tooltip>
</TooltipProvider>
);

return (
Expand Down
2 changes: 1 addition & 1 deletion site/src/modules/resources/PortForwardPopoverView.stories.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ const meta: Meta<typeof PortForwardPopoverView> = {
template: MockTemplate,
workspace: MockWorkspace,
portSharingControlsEnabled: true,
host: "coder.com",
host: "*.coder.com",
},
};

Expand Down
Loading
pFad - Phonifier reborn

Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.

Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.


Alternative Proxies:

Alternative Proxy

pFad Proxy

pFad v3 Proxy

pFad v4 Proxy