From 1b444c6495c75e1d6d8bb01d9a044b4611c38a0e Mon Sep 17 00:00:00 2001 From: Gitar Date: Fri, 4 Oct 2024 12:33:49 +0000 Subject: [PATCH 1/2] [Gitar] Updating TSX files --- .../FeatureToggleListTable.tsx | 105 ++++++++---------- 1 file changed, 45 insertions(+), 60 deletions(-) diff --git a/frontend/src/component/feature/FeatureToggleList/FeatureToggleListTable.tsx b/frontend/src/component/feature/FeatureToggleList/FeatureToggleListTable.tsx index 5cdfc5303488..59872e6db79b 100644 --- a/frontend/src/component/feature/FeatureToggleList/FeatureToggleListTable.tsx +++ b/frontend/src/component/feature/FeatureToggleList/FeatureToggleListTable.tsx @@ -34,7 +34,6 @@ import { FeatureToggleFilters } from './FeatureToggleFilters/FeatureToggleFilter import { withTableState } from 'utils/withTableState'; import { FeatureTagCell } from 'component/common/Table/cells/FeatureTagCell/FeatureTagCell'; import { FeatureSegmentCell } from 'component/common/Table/cells/FeatureSegmentCell/FeatureSegmentCell'; -import { useUiFlag } from 'hooks/useUiFlag'; import { FeatureToggleListActions } from './FeatureToggleListActions/FeatureToggleListActions'; import useLoading from 'hooks/useLoading'; import { usePlausibleTracker } from 'hooks/usePlausibleTracker'; @@ -55,7 +54,7 @@ const feedbackCategory = 'search'; export const FeatureToggleListTable: VFC = () => { const theme = useTheme(); - const featureSearchFeedback = useUiFlag('featureSearchFeedback'); + const featureSearchFeedback = true; const { trackEvent } = usePlausibleTracker(); const { environments } = useEnvironments(); const enabledEnvironments = environments @@ -68,10 +67,7 @@ export const FeatureToggleListTable: VFC = () => { const { setToastApiError } = useToast(); const { uiConfig } = useUiConfig(); - const variant = - featureSearchFeedback !== false - ? featureSearchFeedback?.name ?? '' - : ''; + const variant = featureSearchFeedback?.name ?? ''; const { openFeedback } = useFeedback( feedbackCategory, @@ -322,64 +318,53 @@ export const FeatureToggleListTable: VFC = () => { setShowExportDialog(true)} /> - {featureSearchFeedback !== false && - featureSearchFeedback?.enabled && ( - <> - - - - - - } - /> - - } - onClick={ - createFeedbackContext - } - > - Provide feedback - - } - />{' '} - - } + {featureSearchFeedback?.enabled && ( + <> + + - Provide feedback - - } - /> - - )} + + + + } + /> + } + onClick={createFeedbackContext} + > + Provide feedback + + } + />{' '} + } + onClick={createFeedbackContext} + variant='outlined' + > + Provide feedback + + } + /> + + )} } > From 05e760afe6a167aa5764b5b83952b688cc29bf7f Mon Sep 17 00:00:00 2001 From: Gitar Date: Fri, 4 Oct 2024 12:33:49 +0000 Subject: [PATCH 2/2] [Gitar] Updating TypeScript files --- frontend/src/interfaces/uiConfig.ts | 1 - src/lib/types/experimental.ts | 14 -------------- 2 files changed, 15 deletions(-) diff --git a/frontend/src/interfaces/uiConfig.ts b/frontend/src/interfaces/uiConfig.ts index 837999b05eb0..a562c153063b 100644 --- a/frontend/src/interfaces/uiConfig.ts +++ b/frontend/src/interfaces/uiConfig.ts @@ -69,7 +69,6 @@ export type UiFlags = { signals?: boolean; automatedActions?: boolean; celebrateUnleash?: boolean; - featureSearchFeedback?: Variant; enableLicense?: boolean; adminTokenKillSwitch?: boolean; feedbackComments?: Variant; diff --git a/src/lib/types/experimental.ts b/src/lib/types/experimental.ts index 41df802b1f95..d7e38564d5cb 100644 --- a/src/lib/types/experimental.ts +++ b/src/lib/types/experimental.ts @@ -29,7 +29,6 @@ export type IFlagKey = | 'signals' | 'automatedActions' | 'celebrateUnleash' - | 'featureSearchFeedback' | 'featureSearchFeedbackPosting' | 'extendedUsageMetrics' | 'adminTokenKillSwitch' @@ -147,19 +146,6 @@ const flags: IFlags = { process.env.UNLEASH_EXPERIMENTAL_CELEBRATE_UNLEASH, false, ), - featureSearchFeedback: { - name: 'withText', - enabled: parseEnvVarBoolean( - process.env.UNLEASH_EXPERIMENTAL_FEATURE_SEARCH_FEEDBACK, - false, - ), - payload: { - type: PayloadType.JSON, - value: - process.env - .UNLEASH_EXPERIMENTAL_FEATURE_SEARCH_FEEDBACK_PAYLOAD ?? '', - }, - }, featureSearchFeedbackPosting: parseEnvVarBoolean( process.env.UNLEASH_EXPERIMENTAL_FEATURE_SEARCH_FEEDBACK_POSTING, false,