From 3fe385e1270b6f02587207a09b5c615c51a70185 Mon Sep 17 00:00:00 2001 From: Mateusz Kwasniewski Date: Thu, 8 Aug 2024 12:19:32 +0200 Subject: [PATCH] chore: remove flagCreator flag (#7807) --- .../FeatureOverviewMetaData.tsx | 5 +-- .../ProjectFeatureToggles.tsx | 42 +++++++------------ .../ProjectOverviewFilters.tsx | 16 ++----- .../useProjectFeatureSearch.ts | 4 +- .../__snapshots__/create-config.test.ts.snap | 1 - src/lib/types/experimental.ts | 5 --- src/server-dev.ts | 1 - 7 files changed, 22 insertions(+), 52 deletions(-) diff --git a/frontend/src/component/feature/FeatureView/FeatureOverview/FeatureOverviewMetaData/FeatureOverviewMetaData.tsx b/frontend/src/component/feature/FeatureView/FeatureOverview/FeatureOverviewMetaData/FeatureOverviewMetaData.tsx index 743d4d316f..6e31210cbd 100644 --- a/frontend/src/component/feature/FeatureView/FeatureOverview/FeatureOverviewMetaData/FeatureOverviewMetaData.tsx +++ b/frontend/src/component/feature/FeatureView/FeatureOverview/FeatureOverviewMetaData/FeatureOverviewMetaData.tsx @@ -103,7 +103,6 @@ const FeatureOverviewMetaData = () => { const [showDelDialog, setShowDelDialog] = useState(false); const [showMarkCompletedDialogue, setShowMarkCompletedDialogue] = useState(false); - const flagCreatorEnabled = useUiFlag('flagCreator'); const { locationSettings } = useLocationSettings(); const showDependentFeatures = useShowDependentFeatures(feature.project); @@ -225,9 +224,7 @@ const FeatureOverviewMetaData = () => { ( diff --git a/frontend/src/component/project/Project/PaginatedProjectFeatureToggles/ProjectFeatureToggles.tsx b/frontend/src/component/project/Project/PaginatedProjectFeatureToggles/ProjectFeatureToggles.tsx index 7039d3a9b6..d1913e0116 100644 --- a/frontend/src/component/project/Project/PaginatedProjectFeatureToggles/ProjectFeatureToggles.tsx +++ b/frontend/src/component/project/Project/PaginatedProjectFeatureToggles/ProjectFeatureToggles.tsx @@ -56,7 +56,6 @@ export const ProjectFeatureToggles = ({ }: IPaginatedProjectFeatureTogglesProps) => { const projectId = useRequiredPathParam('projectId'); const featureLifecycleEnabled = useUiFlag('featureLifecycle'); - const flagCreatorEnabled = useUiFlag('flagCreator'); const { features, @@ -76,7 +75,7 @@ export const ProjectFeatureToggles = ({ createdAt: tableState.createdAt, type: tableState.type, state: tableState.state, - ...(flagCreatorEnabled ? { createdBy: tableState.createdBy } : {}), + createdBy: tableState.createdBy, }; const { favorite, unfavorite } = useFavoriteFeaturesApi(); @@ -168,20 +167,16 @@ export const ProjectFeatureToggles = ({ width: '1%', }, }), - ...(flagCreatorEnabled - ? [ - columnHelper.accessor('createdBy', { - id: 'createdBy', - header: 'By', - cell: AvatarCell(onAvatarClick), - enableSorting: false, - meta: { - width: '1%', - align: 'center', - }, - }), - ] - : []), + columnHelper.accessor('createdBy', { + id: 'createdBy', + header: 'By', + cell: AvatarCell(onAvatarClick), + enableSorting: false, + meta: { + width: '1%', + align: 'center', + }, + }), columnHelper.accessor('lastSeenAt', { id: 'lastSeenAt', header: 'Last seen', @@ -425,16 +420,11 @@ export const ProjectFeatureToggles = ({ id: 'createdAt', isVisible: columnVisibility.createdAt, }, - ...(flagCreatorEnabled - ? [ - { - header: 'By', - id: 'createdBy', - isVisible: - columnVisibility.createdBy, - }, - ] - : []), + { + header: 'By', + id: 'createdBy', + isVisible: columnVisibility.createdBy, + }, { header: 'Last seen', id: 'lastSeenAt', diff --git a/frontend/src/component/project/Project/PaginatedProjectFeatureToggles/ProjectOverviewFilters.tsx b/frontend/src/component/project/Project/PaginatedProjectFeatureToggles/ProjectOverviewFilters.tsx index 9b024f09f9..0bbb2da2d3 100644 --- a/frontend/src/component/project/Project/PaginatedProjectFeatureToggles/ProjectOverviewFilters.tsx +++ b/frontend/src/component/project/Project/PaginatedProjectFeatureToggles/ProjectOverviewFilters.tsx @@ -6,7 +6,6 @@ import { type IFilterItem, } from 'component/filter/Filters/Filters'; import { useProjectFlagCreators } from 'hooks/api/getters/useProjectFlagCreators/useProjectFlagCreators'; -import { useUiFlag } from 'hooks/useUiFlag'; interface IProjectOverviewFilters { state: FilterItemParamHolder; @@ -22,7 +21,6 @@ export const ProjectOverviewFilters: VFC = ({ const { tags } = useAllTags(); const { flagCreators } = useProjectFlagCreators(project); const [availableFilters, setAvailableFilters] = useState([]); - const flagCreatorEnabled = useUiFlag('flagCreator'); useEffect(() => { const tagsOptions = (tags || []).map((tag) => ({ @@ -89,24 +87,18 @@ export const ProjectOverviewFilters: VFC = ({ singularOperators: ['IS', 'IS_NOT'], pluralOperators: ['IS_ANY_OF', 'IS_NONE_OF'], }, - ]; - if (flagCreatorEnabled) { - availableFilters.push({ + { label: 'Created by', icon: 'person', options: flagCreatorsOptions, filterKey: 'createdBy', singularOperators: ['IS', 'IS_NOT'], pluralOperators: ['IS_ANY_OF', 'IS_NONE_OF'], - }); - } + }, + ]; setAvailableFilters(availableFilters); - }, [ - JSON.stringify(tags), - JSON.stringify(flagCreators), - flagCreatorEnabled, - ]); + }, [JSON.stringify(tags), JSON.stringify(flagCreators)]); return ( { - const flagCreatorEnabled = useUiFlag('flagCreator'); const stateConfig = { offset: withDefault(NumberParam, 0), limit: withDefault(NumberParam, DEFAULT_PAGE_LIMIT), @@ -41,7 +39,7 @@ export const useProjectFeatureSearch = ( state: FilterItemParam, createdAt: FilterItemParam, type: FilterItemParam, - ...(flagCreatorEnabled ? { createdBy: FilterItemParam } : {}), + createdBy: FilterItemParam, }; const [tableState, setTableState] = usePersistentTableState( `${storageKey}-${projectId}`, diff --git a/src/lib/__snapshots__/create-config.test.ts.snap b/src/lib/__snapshots__/create-config.test.ts.snap index 146f5b0b03..653d94d85a 100644 --- a/src/lib/__snapshots__/create-config.test.ts.snap +++ b/src/lib/__snapshots__/create-config.test.ts.snap @@ -125,7 +125,6 @@ exports[`should create default config 1`] = ` }, }, "filterInvalidClientMetrics": false, - "flagCreator": false, "googleAuthEnabled": false, "improveCreateFlagFlow": false, "insightsV2": false, diff --git a/src/lib/types/experimental.ts b/src/lib/types/experimental.ts index cf1a152b77..16677f115e 100644 --- a/src/lib/types/experimental.ts +++ b/src/lib/types/experimental.ts @@ -59,7 +59,6 @@ export type IFlagKey = | 'enableLegacyVariants' | 'navigationSidebar' | 'commandBarUI' - | 'flagCreator' | 'anonymizeProjectOwners' | 'resourceLimits' | 'extendedMetrics' @@ -292,10 +291,6 @@ const flags: IFlags = { process.env.UNLEASH_EXPERIMENTAL_COMMAND_BAR_UI, false, ), - flagCreator: parseEnvVarBoolean( - process.env.UNLEASH_EXPERIMENTAL_FLAG_CREATOR, - false, - ), anonymizeProjectOwners: parseEnvVarBoolean( process.env.UNLEASH_EXPERIMENTAL_ANONYMIZE_PROJECT_OWNERS, false, diff --git a/src/server-dev.ts b/src/server-dev.ts index baa9a40ffd..60842e4fae 100644 --- a/src/server-dev.ts +++ b/src/server-dev.ts @@ -53,7 +53,6 @@ process.nextTick(async () => { manyStrategiesPagination: true, enableLegacyVariants: false, commandBarUI: true, - flagCreator: true, resourceLimits: true, extendedMetrics: true, insightsV2: true,