Skip to content

feat: move shared ports out of experiment #13120

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 8 commits into from
May 2, 2024
Merged

feat: move shared ports out of experiment #13120

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
3e44582
feat: move shared ports out of experiment
f0ssel May 1, 2024
b16831a
more places
f0ssel May 1, 2024
e11d6bf
more
f0ssel May 1, 2024
f7e01ad
skip test
f0ssel May 1, 2024
2a4ae47
fmt
f0ssel May 1, 2024
ef4c07d
add comments
f0ssel May 2, 2024
d316b31
better test
f0ssel May 2, 2024
ab31bad
Merge branch 'main' into f0ssel/shared-ports-experiment
f0ssel May 2, 2024
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
more places
  • Loading branch information
@f0ssel
f0ssel committed May 1, 2024
commit b16831ae624f9dd92be80c95e42aaf1bc0fe53b1
8 changes: 0 additions & 8 deletions site/src/modules/resources/PortForwardPopoverView.stories.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,6 @@ const meta: Meta<typeof PortForwardPopoverView> = {
agent: MockWorkspaceAgent,
template: MockTemplate,
workspaceID: MockWorkspace.id,
portSharingExperimentEnabled: true,
portSharingControlsEnabled: true,
},
};
Expand Down Expand Up @@ -83,13 +82,6 @@ export const Empty: Story = {
},
};

export const NoPortSharingExperiment: Story = {
args: {
listeningPorts: MockListeningPortsResponse.ports,
portSharingExperimentEnabled: false,
},
};

export const AGPLPortSharing: Story = {
args: {
listeningPorts: MockListeningPortsResponse.ports,
Expand Down
1 change: 0 additions & 1 deletion site/src/modules/resources/PortForwardPopoverView.test.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@ describe("Port Forward Popover View", () => {
template={MockTemplate}
workspaceID={MockWorkspace.id}
listeningPorts={MockListeningPortsResponse.ports}
portSharingExperimentEnabled
portSharingControlsEnabled
host="host"
username="username"
Expand Down
4 changes: 0 additions & 4 deletions site/src/pages/TemplateSettingsPage/TemplateGeneralSettingsPage/TemplateSettingsForm.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,6 @@ export interface TemplateSettingsForm {
initialTouched?: FormikTouched<UpdateTemplateMeta>;
accessControlEnabled: boolean;
advancedSchedulingEnabled: boolean;
portSharingExperimentEnabled: boolean;
portSharingControlsEnabled: boolean;
}

Expand All @@ -74,7 +73,6 @@ export const TemplateSettingsForm: FC<TemplateSettingsForm> = ({
initialTouched,
accessControlEnabled,
advancedSchedulingEnabled,
portSharingExperimentEnabled,
portSharingControlsEnabled,
}) => {
const validationSchema = getValidationSchema();
Expand Down Expand Up @@ -258,7 +256,6 @@ export const TemplateSettingsForm: FC<TemplateSettingsForm> = ({
</FormFields>
</FormSection>

{portSharingExperimentEnabled && (
<FormSection
title="Port Sharing"
description="Shared ports with the Public sharing level can be accessed by anyone,
Expand Down Expand Up @@ -296,7 +293,6 @@ export const TemplateSettingsForm: FC<TemplateSettingsForm> = ({
)}
</FormFields>
</FormSection>
)}

<FormFooter onCancel={onCancel} isLoading={isSubmitting} />
</HorizontalForm>
Expand Down
4 changes: 1 addition & 3 deletions site/src/pages/TemplateSettingsPage/TemplateGeneralSettingsPage/TemplateSettingsPage.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,11 +18,10 @@ export const TemplateSettingsPage: FC = () => {
const { organizationId } = useAuthenticated();
const { template } = useTemplateSettings();
const queryClient = useQueryClient();
const { entitlements, experiments } = useDashboard();
const { entitlements } = useDashboard();
const accessControlEnabled = entitlements.features.access_control.enabled;
const advancedSchedulingEnabled =
entitlements.features.advanced_template_scheduling.enabled;
const sharedPortsExperimentEnabled = experiments.includes("shared-ports");
const sharedPortControlsEnabled =
entitlements.features.control_shared_ports.enabled;

Expand Down Expand Up @@ -73,7 +72,6 @@ export const TemplateSettingsPage: FC = () => {
}}
accessControlEnabled={accessControlEnabled}
advancedSchedulingEnabled={advancedSchedulingEnabled}
sharedPortsExperimentEnabled={sharedPortsExperimentEnabled}
sharedPortControlsEnabled={sharedPortControlsEnabled}
/>
</>
Expand Down
3 changes: 0 additions & 3 deletions site/src/pages/TemplateSettingsPage/TemplateGeneralSettingsPage/TemplateSettingsPageView.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@ export interface TemplateSettingsPageViewProps {
>["initialTouched"];
accessControlEnabled: boolean;
advancedSchedulingEnabled: boolean;
sharedPortsExperimentEnabled: boolean;
sharedPortControlsEnabled: boolean;
}

Expand All @@ -27,7 +26,6 @@ export const TemplateSettingsPageView: FC<TemplateSettingsPageViewProps> = ({
initialTouched,
accessControlEnabled,
advancedSchedulingEnabled,
sharedPortsExperimentEnabled,
sharedPortControlsEnabled,
}) => {
return (
Expand All @@ -45,7 +43,6 @@ export const TemplateSettingsPageView: FC<TemplateSettingsPageViewProps> = ({
error={submitError}
accessControlEnabled={accessControlEnabled}
advancedSchedulingEnabled={advancedSchedulingEnabled}
portSharingExperimentEnabled={sharedPortsExperimentEnabled}
portSharingControlsEnabled={sharedPortControlsEnabled}
/>
</>
Expand Down
Loading