diff --git a/frontend/src/component/feature/FeatureView/FeatureView.tsx b/frontend/src/component/feature/FeatureView/FeatureView.tsx
index 03a59c5978..2ea142a283 100644
--- a/frontend/src/component/feature/FeatureView/FeatureView.tsx
+++ b/frontend/src/component/feature/FeatureView/FeatureView.tsx
@@ -120,7 +120,7 @@ const StyledTabButton = styled(Tab)(({ theme }) => ({
},
}));
-export const StyledLink = styled(Link)(({ theme }) => ({
+export const StyledLink = styled(Link)(() => ({
maxWidth: '100%',
textDecoration: 'none',
'&:hover, &:focus': {
@@ -148,7 +148,6 @@ export const FeatureView = () => {
const [openStaleDialog, setOpenStaleDialog] = useState(false);
const [isFeatureNameCopied, setIsFeatureNameCopied] = useState(false);
const smallScreen = useMediaQuery(`(max-width:${500}px)`);
- const showCollaborators = useUiFlag('featureCollaborators');
const { feature, loading, error, status } = useFeature(
projectId,
@@ -365,13 +364,8 @@ export const FeatureView = () => {
/>
))}
-
- }
+
diff --git a/frontend/src/interfaces/uiConfig.ts b/frontend/src/interfaces/uiConfig.ts
index 16bc8ce27b..35f937aa39 100644
--- a/frontend/src/interfaces/uiConfig.ts
+++ b/frontend/src/interfaces/uiConfig.ts
@@ -92,7 +92,6 @@ export type UiFlags = {
flagCreator?: boolean;
resourceLimits?: boolean;
insightsV2?: boolean;
- featureCollaborators?: boolean;
integrationEvents?: boolean;
improveCreateFlagFlow?: boolean;
newEventSearch?: boolean;
diff --git a/src/lib/__snapshots__/create-config.test.ts.snap b/src/lib/__snapshots__/create-config.test.ts.snap
index edc33639f4..171c49c85f 100644
--- a/src/lib/__snapshots__/create-config.test.ts.snap
+++ b/src/lib/__snapshots__/create-config.test.ts.snap
@@ -104,7 +104,6 @@ exports[`should create default config 1`] = `
"estimateTrafficDataCost": false,
"extendedMetrics": false,
"extendedUsageMetrics": false,
- "featureCollaborators": false,
"featureSearchFeedback": {
"enabled": false,
"name": "withText",
diff --git a/src/lib/features/feature-toggle/feature-toggle-service.ts b/src/lib/features/feature-toggle/feature-toggle-service.ts
index 24af698d25..59491143db 100644
--- a/src/lib/features/feature-toggle/feature-toggle-service.ts
+++ b/src/lib/features/feature-toggle/feature-toggle-service.ts
@@ -1095,18 +1095,13 @@ class FeatureToggleService {
let children: string[] = [];
let lifecycle: IFeatureLifecycleStage | undefined = undefined;
let collaborators: Collaborator[] = [];
- const featureCollaboratorsEnabled = this.flagResolver.isEnabled(
- 'featureCollaborators',
- );
[dependencies, children, lifecycle, collaborators] = await Promise.all([
this.dependentFeaturesReadModel.getParents(featureName),
this.dependentFeaturesReadModel.getChildren([featureName]),
this.featureLifecycleReadModel.findCurrentStage(featureName),
- featureCollaboratorsEnabled
- ? this.featureCollaboratorsReadModel.getFeatureCollaborators(
- featureName,
- )
- : Promise.resolve([]),
+ this.featureCollaboratorsReadModel.getFeatureCollaborators(
+ featureName,
+ ),
]);
if (environmentVariants) {
@@ -1121,9 +1116,7 @@ class FeatureToggleService {
dependencies,
children,
lifecycle,
- ...(featureCollaboratorsEnabled
- ? { collaborators: { users: collaborators } }
- : {}),
+ collaborators: { users: collaborators },
};
} else {
const result =
@@ -1137,9 +1130,7 @@ class FeatureToggleService {
dependencies,
children,
lifecycle,
- ...(featureCollaboratorsEnabled
- ? { collaborators: { users: collaborators } }
- : {}),
+ collaborators: { users: collaborators },
};
}
}
diff --git a/src/lib/features/feature-toggle/tests/feature-toggles.auth.e2e.test.ts b/src/lib/features/feature-toggle/tests/feature-toggles.auth.e2e.test.ts
index a6f90915fb..7e4fc39606 100644
--- a/src/lib/features/feature-toggle/tests/feature-toggles.auth.e2e.test.ts
+++ b/src/lib/features/feature-toggle/tests/feature-toggles.auth.e2e.test.ts
@@ -25,7 +25,6 @@ beforeAll(async () => {
flags: {
strictSchemaValidation: true,
anonymiseEventLog: true,
- featureCollaborators: true,
},
},
},
diff --git a/src/lib/features/feature-toggle/tests/feature-toggles.e2e.test.ts b/src/lib/features/feature-toggle/tests/feature-toggles.e2e.test.ts
index 59df6653d6..fe3a55616e 100644
--- a/src/lib/features/feature-toggle/tests/feature-toggles.e2e.test.ts
+++ b/src/lib/features/feature-toggle/tests/feature-toggles.e2e.test.ts
@@ -317,7 +317,7 @@ test('Should allow to archive/delete feature with children if no orphans are lef
await app.createFeature(child, 'default');
await app.addDependency(child, parent);
- const { body: deleteBody } = await app.request
+ await app.request
.post(`/api/admin/projects/default/delete`)
.set('Content-Type', 'application/json')
.send({ features: [parent, child] })
diff --git a/src/lib/types/experimental.ts b/src/lib/types/experimental.ts
index df52c4d1eb..001d9249ce 100644
--- a/src/lib/types/experimental.ts
+++ b/src/lib/types/experimental.ts
@@ -63,7 +63,6 @@ export type IFlagKey =
| 'removeUnsafeInlineStyleSrc'
| 'insightsV2'
| 'integrationEvents'
- | 'featureCollaborators'
| 'improveCreateFlagFlow'
| 'originMiddleware'
| 'newEventSearch'
@@ -309,10 +308,6 @@ const flags: IFlags = {
process.env.UNLEASH_EXPERIMENTAL_INTEGRATION_EVENTS,
false,
),
- featureCollaborators: parseEnvVarBoolean(
- process.env.UNLEASH_EXPERIMENTAL_FEATURE_COLLABORATORS,
- false,
- ),
improveCreateFlagFlow: parseEnvVarBoolean(
process.env.UNLEASH_EXPERIMENTAL_IMPROVE_CREATE_FLAG_FLOW,
false,
diff --git a/src/server-dev.ts b/src/server-dev.ts
index e6a31f6c31..3dccefc469 100644
--- a/src/server-dev.ts
+++ b/src/server-dev.ts
@@ -56,7 +56,6 @@ process.nextTick(async () => {
extendedMetrics: true,
insightsV2: true,
integrationEvents: true,
- featureCollaborators: true,
improveCreateFlagFlow: true,
originMiddleware: true,
newEventSearch: true,