diff --git a/frontend/src/components/ResizeTable/DynamicColumnTable.tsx b/frontend/src/components/ResizeTable/DynamicColumnTable.tsx index a0202fd907..fb5d734ee8 100644 --- a/frontend/src/components/ResizeTable/DynamicColumnTable.tsx +++ b/frontend/src/components/ResizeTable/DynamicColumnTable.tsx @@ -3,9 +3,9 @@ import './DynamicColumnTable.syles.scss'; import { Button, Dropdown, Flex, MenuProps, Switch } from 'antd'; import { ColumnsType } from 'antd/lib/table'; +import FacingIssueBtn from 'components/facingIssueBtn/FacingIssueBtn'; import { SlidersHorizontal } from 'lucide-react'; import { memo, useEffect, useState } from 'react'; -import FacingIssueBtn from 'utils/facingIssueBtn/FacingIssueBtn'; import { popupContainer } from 'utils/selectPopupContainer'; import ResizeTable from './ResizeTable'; diff --git a/frontend/src/components/ResizeTable/types.ts b/frontend/src/components/ResizeTable/types.ts index bf194a1fc0..35a13127a8 100644 --- a/frontend/src/components/ResizeTable/types.ts +++ b/frontend/src/components/ResizeTable/types.ts @@ -2,7 +2,7 @@ import { TableProps } from 'antd'; import { ColumnsType } from 'antd/es/table'; import { ColumnGroupType, ColumnType } from 'antd/lib/table'; -import { FacingIssueBtnProps } from 'utils/facingIssueBtn/FacingIssueBtn'; +import { FacingIssueBtnProps } from 'components/facingIssueBtn/FacingIssueBtn'; import { TableDataSource } from './contants'; diff --git a/frontend/src/utils/facingIssueBtn/FacingIssueBtn.style.scss b/frontend/src/components/facingIssueBtn/FacingIssueBtn.style.scss similarity index 100% rename from frontend/src/utils/facingIssueBtn/FacingIssueBtn.style.scss rename to frontend/src/components/facingIssueBtn/FacingIssueBtn.style.scss diff --git a/frontend/src/utils/facingIssueBtn/FacingIssueBtn.tsx b/frontend/src/components/facingIssueBtn/FacingIssueBtn.tsx similarity index 70% rename from frontend/src/utils/facingIssueBtn/FacingIssueBtn.tsx rename to frontend/src/components/facingIssueBtn/FacingIssueBtn.tsx index 7ae4f845e2..a8f1917d34 100644 --- a/frontend/src/utils/facingIssueBtn/FacingIssueBtn.tsx +++ b/frontend/src/components/facingIssueBtn/FacingIssueBtn.tsx @@ -3,8 +3,11 @@ import './FacingIssueBtn.style.scss'; import { Button } from 'antd'; import logEvent from 'api/common/logEvent'; import cx from 'classnames'; +import { FeatureKeys } from 'constants/features'; +import useFeatureFlags from 'hooks/useFeatureFlag'; import { defaultTo } from 'lodash-es'; import { HelpCircle } from 'lucide-react'; +import { isCloudUser } from 'utils/app'; export interface FacingIssueBtnProps { eventName: string; @@ -20,7 +23,7 @@ function FacingIssueBtn({ message = '', buttonText = '', className = '', -}: FacingIssueBtnProps): JSX.Element { +}: FacingIssueBtnProps): JSX.Element | null { const handleFacingIssuesClick = (): void => { logEvent(eventName, attributes); @@ -29,7 +32,10 @@ function FacingIssueBtn({ } }; - return ( + const isChatSupportEnabled = useFeatureFlags(FeatureKeys.CHAT_SUPPORT)?.active; + const isCloudUserVal = isCloudUser(); + + return isCloudUserVal && isChatSupportEnabled ? ( // Note: we would need to move this condition to license based in future