From b045a25e4af2adf908354b36ae1ece3379a13b5a Mon Sep 17 00:00:00 2001
From: unleash-bot <194219037+unleash-bot[bot]@users.noreply.github.com>
Date: Thu, 28 Aug 2025 13:12:10 +0000
Subject: [PATCH] feat: Remove filterFlagsToArchive flag and enable its
 features permanently

---
 .../ProjectFeatureToggles.tsx                 |  6 +----
 .../ProjectOverviewFilters.tsx                | 26 ++++++-------------
 frontend/src/interfaces/uiConfig.ts           |  1 -
 src/lib/types/experimental.ts                 |  5 ----
 4 files changed, 9 insertions(+), 29 deletions(-)

diff --git a/frontend/src/component/project/Project/PaginatedProjectFeatureToggles/ProjectFeatureToggles.tsx b/frontend/src/component/project/Project/PaginatedProjectFeatureToggles/ProjectFeatureToggles.tsx
index 57b0fe36fd..774cf46272 100644
--- a/frontend/src/component/project/Project/PaginatedProjectFeatureToggles/ProjectFeatureToggles.tsx
+++ b/frontend/src/component/project/Project/PaginatedProjectFeatureToggles/ProjectFeatureToggles.tsx
@@ -55,7 +55,6 @@ import { UPDATE_FEATURE } from '@server/types/permissions';
 import { ImportModal } from '../Import/ImportModal.tsx';
 import { IMPORT_BUTTON } from 'utils/testIds';
 import { ProjectCleanupReminder } from './ProjectCleanupReminder/ProjectCleanupReminder.tsx';
-import { useUiFlag } from 'hooks/useUiFlag.ts';
 
 interface IPaginatedProjectFeatureTogglesProps {
     environments: string[];
@@ -94,7 +93,6 @@ export const ProjectFeatureToggles = ({
     const { project } = useProjectOverview(projectId);
     const [connectSdkOpen, setConnectSdkOpen] = useState(false);
     const [modalOpen, setModalOpen] = useState(false);
-    const isFilterFlagsToArchiveEnabled = useUiFlag('filterFlagsToArchive');
 
     const {
         features,
@@ -477,9 +475,7 @@ export const ProjectFeatureToggles = ({
     const selectedData = useSelectedData(features, rowSelection);
 
     const showCleanupReminder =
-        isFilterFlagsToArchiveEnabled &&
-        !tableState.lastSeenAt &&
-        !tableState.lifecycle;
+        !tableState.lastSeenAt && !tableState.lifecycle;
 
     return (
         <Container>
diff --git a/frontend/src/component/project/Project/PaginatedProjectFeatureToggles/ProjectOverviewFilters.tsx b/frontend/src/component/project/Project/PaginatedProjectFeatureToggles/ProjectOverviewFilters.tsx
index 1df469dae0..1e2dd4b40f 100644
--- a/frontend/src/component/project/Project/PaginatedProjectFeatureToggles/ProjectOverviewFilters.tsx
+++ b/frontend/src/component/project/Project/PaginatedProjectFeatureToggles/ProjectOverviewFilters.tsx
@@ -7,7 +7,6 @@ import {
 } from 'component/filter/Filters/Filters';
 import { useProjectFlagCreators } from 'hooks/api/getters/useProjectFlagCreators/useProjectFlagCreators';
 import { formatTag } from 'utils/format-tag';
-import { useUiFlag } from 'hooks/useUiFlag';
 
 interface IProjectOverviewFilters {
     state: FilterItemParamHolder;
@@ -22,7 +21,6 @@ export const ProjectOverviewFilters: VFC<IProjectOverviewFilters> = ({
 }) => {
     const { tags } = useAllTags();
     const { flagCreators } = useProjectFlagCreators(project);
-    const filterFlagsToArchiveEnabled = useUiFlag('filterFlagsToArchive');
     const [availableFilters, setAvailableFilters] = useState<IFilterItem[]>([]);
 
     useEffect(() => {
@@ -83,17 +81,13 @@ export const ProjectOverviewFilters: VFC<IProjectOverviewFilters> = ({
                 filterKey: 'createdAt',
                 dateOperators: ['IS_ON_OR_AFTER', 'IS_BEFORE'],
             },
-            ...(filterFlagsToArchiveEnabled
-                ? [
-                      {
-                          label: 'Last seen',
-                          icon: 'monitor_heart',
-                          options: [],
-                          filterKey: 'lastSeenAt',
-                          dateOperators: ['IS_ON_OR_AFTER', 'IS_BEFORE'],
-                      } as IFilterItem,
-                  ]
-                : []),
+            {
+                label: 'Last seen',
+                icon: 'monitor_heart',
+                options: [],
+                filterKey: 'lastSeenAt',
+                dateOperators: ['IS_ON_OR_AFTER', 'IS_BEFORE'],
+            },
             {
                 label: 'Flag type',
                 icon: 'flag',
@@ -140,11 +134,7 @@ export const ProjectOverviewFilters: VFC<IProjectOverviewFilters> = ({
         ];
 
         setAvailableFilters(availableFilters);
-    }, [
-        JSON.stringify(tags),
-        JSON.stringify(flagCreators),
-        filterFlagsToArchiveEnabled,
-    ]);
+    }, [JSON.stringify(tags), JSON.stringify(flagCreators)]);
 
     return (
         <Filters
diff --git a/frontend/src/interfaces/uiConfig.ts b/frontend/src/interfaces/uiConfig.ts
index db53b93cc2..3a4980293c 100644
--- a/frontend/src/interfaces/uiConfig.ts
+++ b/frontend/src/interfaces/uiConfig.ts
@@ -90,7 +90,6 @@ export type UiFlags = {
     reportUnknownFlags?: boolean;
     lifecycleGraphs?: boolean;
     addConfiguration?: boolean;
-    filterFlagsToArchive?: boolean;
 };
 
 export interface IVersionInfo {
diff --git a/src/lib/types/experimental.ts b/src/lib/types/experimental.ts
index 24e3bc3938..7b42887c06 100644
--- a/src/lib/types/experimental.ts
+++ b/src/lib/types/experimental.ts
@@ -58,7 +58,6 @@ export type IFlagKey =
     | 'changeRequestApproverEmails'
     | 'lifecycleGraphs'
     | 'addConfiguration'
-    | 'filterFlagsToArchive'
     | 'fetchMode'
     | 'etagByEnv';
 
@@ -268,10 +267,6 @@ const flags: IFlags = {
         process.env.UNLEASH_EXPERIMENTAL_ADD_CONFIGURATION,
         false,
     ),
-    filterFlagsToArchive: parseEnvVarBoolean(
-        process.env.UNLEASH_EXPERIMENTAL_FILTER_FLAGS_TO_ARCHIVE,
-        false,
-    ),
     fetchMode: {
         name: 'disabled',
         feature_enabled: false,