Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@devtron-labs/devtron-fe-common-lib",
"version": "1.19.0",
"version": "1.19.1",
"description": "Supporting common component library",
"type": "module",
"main": "dist/index.js",
Expand Down
320 changes: 320 additions & 0 deletions src/Assets/IconV2/ic-upgrade-enterprise.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions src/Shared/Components/GenericModal/constants.ts
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
import { GenericModalProps } from './types'

export const MODAL_WIDTH_TO_CLASS_NAME_MAP: Record<GenericModalProps['width'], string> = {
450: 'w-450',
500: 'w-500',
600: 'w-600',
800: 'w-800',
Expand Down
2 changes: 1 addition & 1 deletion src/Shared/Components/GenericModal/types.ts
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ export interface GenericModalProps extends Partial<Pick<BackdropProps, 'onEscape
* Width of the modal (in pixels).
* @default 600
*/
width?: 500 | 600 | 800
width?: 450 | 500 | 600 | 800
/**
* Determines if the modal should close when the user clicks outside of it (on the backdrop).
* @default false
Expand Down
2 changes: 1 addition & 1 deletion src/Shared/Components/Header/HelpButton.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -148,7 +148,7 @@ export const HelpButton = ({ serverInfo, fetchingServerInfo, onClick, hideGettin
alignment="end"
width={220}
options={getHelpActionMenuOptions({
isTrial: licenseData?.isTrial ?? false,
isTrialOrFreemium: (licenseData?.isTrial || licenseData?.isFreemium) ?? false,
isEnterprise,
})}
onClick={handleActionMenuClick}
Expand Down
8 changes: 5 additions & 3 deletions src/Shared/Components/Header/utils.ts
Original file line number Diff line number Diff line change
Expand Up @@ -44,10 +44,10 @@ export const setActionWithExpiry = (key: string, days: number): void => {

export const getHelpActionMenuOptions = ({
isEnterprise,
isTrial,
isTrialOrFreemium,
}: {
isEnterprise: boolean
isTrial: boolean
isTrialOrFreemium: boolean
}): HelpButtonActionMenuProps['options'] => [
{
items: COMMON_HELP_ACTION_MENU_ITEMS,
Expand All @@ -56,7 +56,9 @@ export const getHelpActionMenuOptions = ({
? [
{
groupLabel: 'Enterprise Support',
items: isTrial ? ENTERPRISE_TRIAL_HELP_ACTION_MENU_ITEMS : ENTERPRISE_HELP_ACTION_MENU_ITEMS,
items: isTrialOrFreemium
? ENTERPRISE_TRIAL_HELP_ACTION_MENU_ITEMS
: ENTERPRISE_HELP_ACTION_MENU_ITEMS,
},
]
: [
Expand Down
Loading
Loading