diff --git a/docs/docs/deployment/index.md b/docs/docs/deployment/index.md index bbc46f359ba4..68dcc68ef955 100644 --- a/docs/docs/deployment/index.md +++ b/docs/docs/deployment/index.md @@ -190,7 +190,6 @@ The list of the flags and remote config we're currently using in production is b | `default_environment_names_for_new_project` | Names of default environments to create when creating a new project (e.g. `["Development", "Production"]`) | None | | `disable_create_org` | Turning this on will prevent users from creating any additional organisations | None | | `disable_users_as_reviewers` | If enabled, this flag will hide the Assigned users section in the Change Requests and in the Create Change Request modal in the Features page. | None | -| `enable_metadata` | If enabled, metadata can be handled | None | | `feature_versioning` | Opt into feature versioning for your environment | None | | `integration_data` | Integration config for different providers | [See Below](#integration_data) | | `mailing_list` | Determines if mailing list consent is shown on signup | None | diff --git a/frontend/web/components/modals/CreateFlag.js b/frontend/web/components/modals/CreateFlag.js index 99dd33991c6f..0944af419e66 100644 --- a/frontend/web/components/modals/CreateFlag.js +++ b/frontend/web/components/modals/CreateFlag.js @@ -186,10 +186,7 @@ const CreateFlag = class extends Component { ) { this.getFeatureUsage() } - if ( - Utils.getPlansPermission('METADATA') && - Utils.getFlagsmithHasFeature('enable_metadata') - ) { + if (Utils.getPlansPermission('METADATA')) { getSupportedContentType(getStore(), { organisation_id: AccountStore.getOrganisation().id, }).then((res) => { @@ -566,9 +563,7 @@ parseError = (error)=>{ const hideIdentityOverridesTab = Utils.getShouldHideIdentityOverridesTab() const noPermissions = this.props.noPermissions let regexValid = true - const metadataEnable = - Utils.getPlansPermission('METADATA') && - Utils.getFlagsmithHasFeature('enable_metadata') + const metadataEnable = Utils.getPlansPermission('METADATA') try { if (!isEdit && name && regex) { diff --git a/frontend/web/components/modals/CreateSegment.tsx b/frontend/web/components/modals/CreateSegment.tsx index 6d7a544201cc..c31e8fa27d0a 100644 --- a/frontend/web/components/modals/CreateSegment.tsx +++ b/frontend/web/components/modals/CreateSegment.tsx @@ -161,9 +161,7 @@ const CreateSegment: FC = ({ const [metadata, setMetadata] = useState( segment.metadata, ) - const metadataEnable = - Utils.getPlansPermission('METADATA') && - Utils.getFlagsmithHasFeature('enable_metadata') + const metadataEnable = Utils.getPlansPermission('METADATA') const error = createError || updateError const totalSegments = ProjectStore.getTotalSegments() ?? 0 const maxSegmentsAllowed = ProjectStore.getMaxSegmentsAllowed() ?? 0 diff --git a/frontend/web/components/pages/CreateEnvironmentPage.js b/frontend/web/components/pages/CreateEnvironmentPage.js index 682031e7feb5..416a0fb0252e 100644 --- a/frontend/web/components/pages/CreateEnvironmentPage.js +++ b/frontend/web/components/pages/CreateEnvironmentPage.js @@ -33,10 +33,7 @@ const CreateEnvironmentPage = class extends Component { componentDidMount = () => { API.trackPage(Constants.pages.CREATE_ENVIRONMENT) - if ( - Utils.getPlansPermission('METADATA') && - Utils.getFlagsmithHasFeature('enable_metadata') - ) { + if (Utils.getPlansPermission('METADATA')) { getSupportedContentType(getStore(), { organisation_id: AccountStore.getOrganisation().id, }).then((res) => { @@ -200,7 +197,6 @@ const CreateEnvironmentPage = class extends Component { )} {Utils.getPlansPermission('METADATA') && - Utils.getFlagsmithHasFeature('enable_metadata') && envContentType?.id && ( diff --git a/frontend/web/components/pages/EnvironmentSettingsPage.js b/frontend/web/components/pages/EnvironmentSettingsPage.js index 94906abb271b..bf74d06d8ed5 100644 --- a/frontend/web/components/pages/EnvironmentSettingsPage.js +++ b/frontend/web/components/pages/EnvironmentSettingsPage.js @@ -83,10 +83,7 @@ const EnvironmentSettingsPage = class extends Component { }) }) - if ( - Utils.getPlansPermission('METADATA') && - Utils.getFlagsmithHasFeature('enable_metadata') - ) { + if (Utils.getPlansPermission('METADATA')) { getSupportedContentType(getStore(), { organisation_id: AccountStore.getOrganisation().id, }).then((res) => { @@ -266,9 +263,7 @@ const EnvironmentSettingsPage = class extends Component { }, } = this const has4EyesPermission = Utils.getPlansPermission('4_EYES') - const metadataEnable = - Utils.getPlansPermission('METADATA') && - Utils.getFlagsmithHasFeature('enable_metadata') + const metadataEnable = Utils.getPlansPermission('METADATA') return (
diff --git a/frontend/web/components/pages/ProjectSettingsPage.js b/frontend/web/components/pages/ProjectSettingsPage.js index 4d2bd372c31b..9f4a98e123d4 100644 --- a/frontend/web/components/pages/ProjectSettingsPage.js +++ b/frontend/web/components/pages/ProjectSettingsPage.js @@ -170,8 +170,6 @@ const ProjectSettingsPage = class extends Component { const { name, stale_flags_limit_days } = this.state const hasStaleFlagsPermission = Utils.getPlansPermission('STALE_FLAGS') - const metadataEnable = Utils.getFlagsmithHasFeature('enable_metadata') - return (
- {metadataEnable && ( - - - - )} + + + {!!ProjectStore.getEnvs()?.length && (