opensource/coder
3
0
Fork 0
mirror of https://github.com/coder/coder.git synced 2026-10-24 23:14:28 +08:00
Code Issues Packages Projects Releases Wiki Activity

chore: remove multi-organization and custom role experiment (#14862)

Browse Source 
Closes https://github.com/coder/coder/issues/14704

---------

Co-authored-by: Kayla Washburn-Love <mckayla@hey.com>
This commit is contained in:
Steven Masley
2024-09-27 14:06:16 -05:00
committed by GitHub
co-authored by Kayla Washburn-Love
parent 339eebacae
commit 2c8b264d78
32 changed files with 60 additions and 490 deletions
Download Patch File Download Diff File Expand all files Collapse all files
site/e2e/playwright.config.ts
+1 -1
View File
@@ -148,7 +148,7 @@ export default defineConfig({
gitAuth.validatePath,
),
CODER_PPROF_ADDRESS: `127.0.0.1:${coderdPProfPort}`,
CODER_EXPERIMENTS: `multi-organization,${e2eFakeExperiment1},${e2eFakeExperiment2}`,
CODER_EXPERIMENTS: `${e2eFakeExperiment1},${e2eFakeExperiment2}`,
// Tests for Deployment / User Authentication / OIDC
CODER_OIDC_ISSUER_URL: "https://accounts.google.com",
site/src/api/typesGenerated.ts
Generated
+2 -2
View File
@@ -2090,8 +2090,8 @@ export type Entitlement = "entitled" | "grace_period" | "not_entitled"
export const Entitlements: Entitlement[] = ["entitled", "grace_period", "not_entitled"]
// From codersdk/deployment.go
export type Experiment = "auto-fill-parameters" | "custom-roles" | "example" | "multi-organization" | "notifications" | "workspace-usage"
export const Experiments: Experiment[] = ["auto-fill-parameters", "custom-roles", "example", "multi-organization", "notifications", "workspace-usage"]
export type Experiment = "auto-fill-parameters" | "example" | "notifications" | "workspace-usage"
export const Experiments: Experiment[] = ["auto-fill-parameters", "example", "notifications", "workspace-usage"]
// From codersdk/deployment.go
export type FeatureName = "access_control" | "advanced_template_scheduling" | "appearance" | "audit_log" | "browser_only" | "control_shared_ports" | "custom_roles" | "external_provisioner_daemons" | "external_token_encryption" | "high_availability" | "multiple_external_auth" | "multiple_organizations" | "scim" | "template_rbac" | "user_limit" | "user_role_management" | "workspace_batch_actions" | "workspace_proxy"
site/src/modules/dashboard/DashboardProvider.tsx
+3 -3
View File
@@ -55,9 +55,9 @@ export const DashboardProvider: FC<PropsWithChildren> = ({ children }) => {
}
const hasMultipleOrganizations = organizationsQuery.data.length > 1;
const organizationsEnabled =
experimentsQuery.data.includes("multi-organization") &&
selectFeatureVisibility(entitlementsQuery.data).multiple_organizations;
const organizationsEnabled = selectFeatureVisibility(
entitlementsQuery.data,
).multiple_organizations;
return (
<DashboardContext.Provider
site/src/pages/ManagementSettingsPage/SidebarView.tsx
+5 -8
View File
@@ -282,14 +282,11 @@ const OrganizationSettingsNavigation: FC<
Groups
</SidebarNavSubItem>
)}
{organization.permissions.assignOrgRole &&
experiments.includes("custom-roles") && (
<SidebarNavSubItem
href={urlForSubpage(organization.name, "roles")}
>
Roles
</SidebarNavSubItem>
)}
{organization.permissions.assignOrgRole && (
<SidebarNavSubItem href={urlForSubpage(organization.name, "roles")}>
Roles
</SidebarNavSubItem>
)}
{organization.permissions.viewProvisioners && (
<SidebarNavSubItem
href={urlForSubpage(organization.name, "provisioners")}