chore: Remove enable_metadata flag (#4759)

Flagsmith · Oct 25, 2024 · f4fd34b · f4fd34b
1 parent 1567487
commit f4fd34b
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 33 deletions.
diff --git 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
@@ -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
@@ -161,9 +161,7 @@ const CreateSegment: FC<CreateSegmentType> = ({
   const [metadata, setMetadata] = useState<CustomMetadataField[]>(
     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
@@ -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 {
                               )}
                             </div>
                             {Utils.getPlansPermission('METADATA') &&
-                              Utils.getFlagsmithHasFeature('enable_metadata') &&
                               envContentType?.id && (
                                 <CondensedRow>
                                   <FormGroup className='mt-5 setting'>

diff --git 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 (
       <div className='app-container container'>

diff --git 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 (
       <div className='app-container container'>
         <ProjectProvider
@@ -605,14 +603,12 @@ const ProjectSettingsPage = class extends Component {
                         roles={this.state.roles}
                       />
                     </TabItem>
-                    {metadataEnable && (
-                      <TabItem tabLabel='Custom Fields'>
-                        <MetadataPage
-                          organisationId={AccountStore.getOrganisation().id}
-                          projectId={this.props.match.params.projectId}
-                        />
-                      </TabItem>
-                    )}
+                    <TabItem tabLabel='Custom Fields'>
+                      <MetadataPage
+                        organisationId={AccountStore.getOrganisation().id}
+                        projectId={this.props.match.params.projectId}
+                      />
+                    </TabItem>
                     {!!ProjectStore.getEnvs()?.length && (
                       <TabItem data-test='js-import-page' tabLabel='Import'>
                         <ImportPage