Skip to content

Commit 7f35a9c

Browse files
RohitRaj011RohitRaj011
committed
feat: DocLink - consume isEnterprise from MainContext, remove isEnterprise prop and use from main context across components
1 parent 71ff524 commit 7f35a9c

File tree

14 files changed

+12
-33
lines changed

14 files changed

+12
-33
lines changed

‎src/Common/TippyCustomized.tsx‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,6 @@ export const TippyCustomized = <T extends boolean = false>(props: TippyCustomize
7979
additionalContent,
8080
documentationLink,
8181
documentationLinkText,
82-
isEnterprise,
8382
isExternalLink,
8483
openInNewTab,
8584
} = props
@@ -165,7 +164,6 @@ export const TippyCustomized = <T extends boolean = false>(props: TippyCustomize
165164
dataTestId="learn-more-about-tippy-link"
166165
showExternalIcon
167166
onClick={closeTippy}
168-
isEnterprise={isEnterprise}
169167
isExternalLink={isExternalLink}
170168
docLinkKey={documentationLink}
171169
openInNewTab={openInNewTab}

‎src/Common/Types.ts‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -121,7 +121,7 @@ export interface CheckboxProps {
121121
}
122122

123123
export interface TippyWithBaseDocLinkTypes<T extends boolean>
124-
extends Pick<DocLinkProps<T>, 'isEnterprise' | 'isExternalLink' | 'openInNewTab'> {
124+
extends Pick<DocLinkProps<T>, 'isExternalLink' | 'openInNewTab'> {
125125
documentationLink?: DocLinkProps<T>['docLinkKey']
126126
}
127127

@@ -168,7 +168,6 @@ export interface InfoIconTippyProps<T extends boolean = false>
168168
| 'Icon'
169169
| 'headingInfo'
170170
| 'documentationLink'
171-
| 'isEnterprise'
172171
| 'isExternalLink'
173172
| 'openInNewTab'
174173
> {

‎src/Shared/Components/AboutDevtron/AboutDevtronBody.tsx‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,14 +5,12 @@ import { EULA_LINK, PRIVACY_POLICY_LINK, TERMS_OF_USE_LINK } from '@Shared/const
55
import { useMainContext } from '@Shared/Providers'
66

77
import { Button, ButtonComponentType, ButtonStyleType, ButtonVariantType } from '../Button'
8-
import { InstallationType } from '../Header/types'
98
import { Icon } from '../Icon'
109

1110
const AboutDevtronBody = ({ isFELibAvailable }: { isFELibAvailable: boolean }) => {
12-
const { currentServerInfo } = useMainContext()
11+
const { currentServerInfo, isEnterprise } = useMainContext()
1312

1413
const currentVersion = currentServerInfo?.serverInfo?.currentVersion
15-
const isEnterprise = currentServerInfo?.serverInfo?.installationType === InstallationType.ENTERPRISE
1614

1715
const isVersionCompatible = isFELibAvailable === isEnterprise
1816

‎src/Shared/Components/FeatureDescription/FeatureDescriptionModal.tsx‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,6 @@ const FeatureDescriptionModalContent = ({
3434
imageVariant,
3535
SVGImage,
3636
imageStyles = {},
37-
isEnterprise,
3837
}: Required<Omit<FeatureDescriptionModalProps, 'tabsConfig' | 'title'>>) => {
3938
const renderImage = () => {
4039
if (!SVGImage) {
@@ -70,7 +69,6 @@ const FeatureDescriptionModalContent = ({
7069
dataTestId="feature-desc__view-doc"
7170
showExternalIcon
7271
variant={ButtonVariantType.secondary}
73-
isEnterprise={isEnterprise}
7472
onClick={closeModal}
7573
/>
7674
)}
@@ -101,7 +99,6 @@ export const FeatureDescriptionModal = ({
10199
SVGImage,
102100
imageStyles = {},
103101
tabsConfig,
104-
isEnterprise,
105102
}: FeatureDescriptionModalProps) => {
106103
const [selectedTabId, setSelectedTabId] = useState(tabsConfig?.[0]?.id ?? null)
107104
const selectedTab = tabsConfig?.find((tab) => tab.id === selectedTabId) ?? null
@@ -144,7 +141,6 @@ export const FeatureDescriptionModal = ({
144141
renderDescriptionContent={selectedTab.renderDescriptionContent}
145142
closeModal={closeModal}
146143
closeModalText={closeModalText}
147-
isEnterprise={isEnterprise}
148144
/>
149145
</>
150146
)
@@ -157,7 +153,6 @@ export const FeatureDescriptionModal = ({
157153
imageStyles={imageStyles}
158154
imageVariant={imageVariant}
159155
renderDescriptionContent={renderDescriptionContent}
160-
isEnterprise={isEnterprise}
161156
/>
162157
)}
163158
</div>

‎src/Shared/Components/FeatureDescription/FeatureTitleWithInfo.tsx‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,6 @@ const FeatureTitleWithInfo = ({
3838
additionalContent,
3939
showInfoIcon = false,
4040
tabsConfig,
41-
isEnterprise,
4241
}: DescriptorProps) => {
4342
const [showFeatureDescriptionModal, setShowFeatureDescriptionModal] = useState(false)
4443
const onClickInfoIcon = () => {
@@ -64,7 +63,6 @@ const FeatureTitleWithInfo = ({
6463
documentationLink={docLink}
6564
documentationLinkText={docLinkText}
6665
dataTestid="info-tippy-button"
67-
isEnterprise={isEnterprise}
6866
/>
6967
</div>
7068
)
@@ -97,7 +95,6 @@ const FeatureTitleWithInfo = ({
9795
<FeatureDescriptionModal
9896
title={title}
9997
closeModal={closeModal}
100-
isEnterprise={isEnterprise}
10198
closeModalText={closeModalText}
10299
{...(Array.isArray(tabsConfig)
103100
? {

‎src/Shared/Components/FeatureDescription/types.ts‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,6 @@ export type FeatureDescriptionModalProps = {
5555
title: string
5656
closeModalText?: string
5757
closeModal?: () => void
58-
isEnterprise?: boolean
5958
} & (
6059
| (BaseFeatureDescriptionModalProps & {
6160
tabsConfig?: never
@@ -84,5 +83,4 @@ export type DescriptorProps = (
8483
* @default false
8584
*/
8685
showInfoIcon?: boolean
87-
isEnterprise?: boolean
8886
}

‎src/Shared/Components/Header/HelpButton.tsx‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,12 @@ import { SliderButton } from '@typeform/embed-react'
55
import { URLS } from '@Common/Constants'
66
import { ComponentSizeType } from '@Shared/constants'
77
import { useMainContext } from '@Shared/Providers'
8+
import { InstallationType } from '@Shared/types'
89

910
import { ActionMenu, ActionMenuItemType } from '../ActionMenu'
1011
import { Button, ButtonComponentType, ButtonVariantType } from '../Button'
1112
import { Icon } from '../Icon'
12-
import { HelpButtonActionMenuProps, HelpButtonProps, HelpMenuItems, InstallationType } from './types'
13+
import { HelpButtonActionMenuProps, HelpButtonProps, HelpMenuItems } from './types'
1314
import { getHelpActionMenuOptions } from './utils'
1415

1516
const CheckForUpdates = ({
@@ -40,14 +41,13 @@ export const HelpButton = ({ serverInfo, fetchingServerInfo, onClick }: HelpButt
4041
const [isActionMenuOpen, setIsActionMenuOpen] = useState(false)
4142

4243
// HOOKS
43-
const { currentServerInfo, handleOpenLicenseInfoDialog, licenseData, setGettingStartedClicked } = useMainContext()
44+
const { handleOpenLicenseInfoDialog, licenseData, setGettingStartedClicked, isEnterprise } = useMainContext()
4445

4546
// REFS
4647
const typeFormSliderButtonRef = useRef(null)
4748

4849
// CONSTANTS
4950
const FEEDBACK_FORM_ID = `UheGN3KJ#source=${window.location.hostname}`
50-
const isEnterprise = currentServerInfo?.serverInfo?.installationType === InstallationType.ENTERPRISE
5151

5252
// HANDLERS
5353
const handleAnalytics = (option: ActionMenuItemType) => {

‎src/Shared/Components/Header/PageHeader.tsx‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ import Tippy from '@tippyjs/react'
2121
import { ReactComponent as ICCaretDownSmall } from '@Icons/ic-caret-down-small.svg'
2222
import { ReactComponent as Close } from '@Icons/ic-close.svg'
2323
import { ReactComponent as ICMediumPaintBucket } from '@IconsV2/ic-medium-paintbucket.svg'
24+
import { InstallationType } from '@Shared/types'
2425

2526
import { getAlphabetIcon, TippyCustomized, TippyTheme } from '../../../Common'
2627
import { MAX_LOGIN_COUNT, POSTHOG_EVENT_ONBOARDING } from '../../../Common/Constants'
@@ -31,7 +32,7 @@ import LogoutCard from '../LogoutCard'
3132
import { HelpButton } from './HelpButton'
3233
import { IframePromoButton } from './IframePromoButton'
3334
import { getServerInfo } from './service'
34-
import { InstallationType, PageHeaderType, ServerInfo } from './types'
35+
import { PageHeaderType, ServerInfo } from './types'
3536
import { getIsShowingLicenseData, handlePostHogEventUpdate, setActionWithExpiry } from './utils'
3637

3738
import './pageHeader.scss'
@@ -48,7 +49,6 @@ const PageHeader = ({
4849
onClose,
4950
markAsBeta,
5051
tippyProps,
51-
isEnterprise,
5252
}: PageHeaderType) => {
5353
const { loginCount, setLoginCount, showGettingStartedCard, setShowGettingStartedCard, licenseData } =
5454
useMainContext()
@@ -155,7 +155,6 @@ const PageHeader = ({
155155
interactive
156156
arrow
157157
onClose={handleCloseSwitchThemeLocationTippyChange}
158-
isEnterprise={isEnterprise}
159158
documentationLink={tippyRedirectLink}
160159
>
161160
<button

‎src/Shared/Components/InfoIconTippy/InfoIconTippy.tsx‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,6 @@ const InfoIconTippy = <T extends boolean = false>({
3232
children,
3333
headingInfo,
3434
buttonPadding = 'p-0',
35-
isEnterprise = false,
3635
isExternalLink,
3736
openInNewTab,
3837
}: InfoIconTippyProps<T>) => (
@@ -53,7 +52,6 @@ const InfoIconTippy = <T extends boolean = false>({
5352
additionalContent={additionalContent}
5453
animation="shift-toward"
5554
duration={400}
56-
isEnterprise={isEnterprise}
5755
isExternalLink={isExternalLink}
5856
openInNewTab={openInNewTab}
5957
>

‎src/Shared/Components/ModalSidebarPanel/ModalSidebarPanel.component.tsx‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@ const ModalSidebarPanel = ({
2424
icon,
2525
children,
2626
documentationLink,
27-
isEnterprise = false,
2827
}: ModalSidebarPanelProps) => (
2928
<div className={`flexbox-col w-250 dc__gap-24 dc__modal-gradient ${rootClassName}`}>
3029
<div className="flexbox-col dc__gap-12">
@@ -43,7 +42,6 @@ const ModalSidebarPanel = ({
4342
text="View documentation"
4443
dataTestId="learn-more-about-modal-sidebar-panel-link"
4544
showExternalIcon
46-
isEnterprise={isEnterprise}
4745
openInNewTab
4846
/>
4947
</div>

0 commit comments

Comments
 (0)