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.21.0-pre-2",
"version": "1.21.0-pre-3",
"description": "Supporting common component library",
"type": "module",
"main": "dist/index.js",
Expand Down
1 change: 1 addition & 0 deletions src/Pages-Devtron-2.0/Navigation/index.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
export * from './types'
116 changes: 116 additions & 0 deletions src/Pages-Devtron-2.0/Navigation/types.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,116 @@
import { customEnv, Never } from 'src'

import { IconsProps } from '@Shared/Components'

export type NavigationItemID =
| 'application-management-overview'
| 'application-management-devtron-applications'
| 'application-management-application-groups'
| 'application-management-bulk-edit'
| 'application-management-application-templates'
| 'application-management-projects'
| 'application-management-configurations'
| 'application-management-policies'
| 'infrastructure-management-overview'
| 'infrastructure-management-applications'
| 'infrastructure-management-chart-store'
| 'infrastructure-management-resource-browser'
| 'infrastructure-management-resource-watcher'
| 'infrastructure-management-catalog-framework'
| 'software-release-management-overview'
| 'software-release-management-release-hub'
| 'software-release-management-tenants'
| 'cost-visibility-overview'
| 'cost-visibility-cost-breakdown'
| 'cost-visibility-configurations'
| 'security-center-overview'
| 'security-center-security-vulnerabilities'
| 'security-center-security-enablement'
| 'security-center-security-policy'
| 'automation-and-enablement-jobs'
| 'automation-and-enablement-alerting'
| 'automation-and-enablement-incident-response'
| 'automation-and-enablement-api-portal'
| 'automation-and-enablement-runbook-automation'
| 'global-configuration-sso-login-services'
| 'global-configuration-host-urls'
| 'global-configuration-external-links'
| 'global-configuration-chart-repository'
| 'global-configuration-cluster-and-environments'
| 'global-configuration-container-oci-registry'
| 'global-configuration-authorization'
| 'data-protection-overview'
| 'data-protection-backup-and-schedule'
| 'data-protection-restores'
| 'data-protection-backup-repositories'
| 'data-protection-backup-locations'
| 'data-protection-history-and-logs'

export type NavigationSubMenuItemID =
| 'application-management-configurations-gitops'
| 'application-management-configurations-git-accounts'
| 'application-management-configurations-deployment-charts'
| 'application-management-configurations-notifications'
| 'application-management-configurations-catalog-frameworks'
| 'application-management-configurations-scoped-variables'
| 'application-management-configurations-build-infra'
| 'application-management-policies-deployment-window'
| 'application-management-policies-approval-policy'
| 'application-management-policies-plugin-policy'
| 'application-management-policies-pull-image-digest'
| 'application-management-policies-tag-policy'
| 'application-management-policies-filter-conditions'
| 'application-management-policies-image-promotion'
| 'application-management-policies-lock-deployment-configuration'
| 'cost-visibility-cost-breakdown-clusters'
| 'cost-visibility-cost-breakdown-environments'
| 'cost-visibility-cost-breakdown-projects'
| 'cost-visibility-cost-breakdown-applications'
| 'global-configuration-authorization-user-permissions'
| 'global-configuration-authorization-permission-groups'
| 'global-configuration-authorization-api-tokens'

export type NavigationRootItemID =
| 'application-management'
| 'infrastructure-management'
| 'software-release-management'
| 'cost-visibility'
| 'security-center'
| 'automation-and-enablement'
| 'data-protection-management'
| 'global-configuration'

export type CommonNavigationItemType = {
title: string
dataTestId: string
icon: IconsProps['name']
href: string
disabled?: boolean
keywords?: string[]
forceHideEnvKey?: keyof customEnv
hideNav?: boolean
isAvailableInEA?: boolean
}

export type NavigationItemType = Pick<
CommonNavigationItemType,
'dataTestId' | 'title' | 'disabled' | 'keywords' | 'hideNav' | 'forceHideEnvKey' | 'isAvailableInEA'
> & {
id: NavigationItemID
} & (
| (Pick<CommonNavigationItemType, 'icon' | 'href'> & {
hasSubMenu?: false
subItems?: never
})
| (Never<Pick<CommonNavigationItemType, 'icon' | 'href'>> & {
hasSubMenu: true
subItems: (Omit<CommonNavigationItemType, 'icon' | 'isAvailableInEA'> & { id: NavigationSubMenuItemID })[]
})
)

export interface NavigationGroupType
extends Pick<CommonNavigationItemType, 'title' | 'icon' | 'hideNav' | 'forceHideEnvKey' | 'isAvailableInEA'> {
id: NavigationRootItemID
items: NavigationItemType[]
disabled?: boolean
}
1 change: 1 addition & 0 deletions src/Pages-Devtron-2.0/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,5 @@ export * from './ApplicationManagement'
export * from './CostVisibility'
export * from './DataProtectionManagement'
export * from './InfrastructureManagement'
export * from './Navigation'
export * from './SecurityCenter'
Original file line number Diff line number Diff line change
Expand Up @@ -183,10 +183,8 @@ export const SelectPickerTextArea = ({
selectRef.current.inputRef.selectionEnd = selectionStart + 1
})

return
updateValueIfOnlyDirty()
}

updateValueIfOnlyDirty()
}

return (
Expand Down
69 changes: 1 addition & 68 deletions src/Shared/Hooks/useUserPreferences/types.ts
Original file line number Diff line number Diff line change
Expand Up @@ -17,74 +17,7 @@
import { USER_PREFERENCES_ATTRIBUTE_KEY } from '@Shared/Hooks/useUserPreferences/constants'
import { AppThemeType, ThemeConfigType, ThemePreferenceType } from '@Shared/Providers/ThemeProvider/types'
import { ResourceKindType } from '@Shared/types'

export type NavigationItemID =
| 'application-management-overview'
| 'application-management-devtron-applications'
| 'application-management-application-groups'
| 'application-management-bulk-edit'
| 'application-management-application-templates'
| 'application-management-projects'
| 'application-management-configurations'
| 'application-management-policies'
| 'infrastructure-management-overview'
| 'infrastructure-management-applications'
| 'infrastructure-management-chart-store'
| 'infrastructure-management-resource-browser'
| 'infrastructure-management-resource-watcher'
| 'infrastructure-management-catalog-framework'
| 'software-release-management-overview'
| 'software-release-management-release-hub'
| 'software-release-management-tenants'
| 'cost-visibility-overview'
| 'cost-visibility-cost-breakdown'
| 'cost-visibility-configurations'
| 'security-center-overview'
| 'security-center-security-vulnerabilities'
| 'security-center-security-enablement'
| 'security-center-security-policy'
| 'automation-and-enablement-jobs'
| 'automation-and-enablement-alerting'
| 'automation-and-enablement-incident-response'
| 'automation-and-enablement-api-portal'
| 'automation-and-enablement-runbook-automation'
| 'global-configuration-sso-login-services'
| 'global-configuration-host-urls'
| 'global-configuration-cluster-and-environments'
| 'global-configuration-container-oci-registry'
| 'global-configuration-authorization'
| 'data-protection-overview'
| 'data-protection-backup-and-schedule'
| 'data-protection-restores'
| 'data-protection-backup-repositories'
| 'data-protection-backup-locations'
| 'data-protection-history-and-logs'

export type NavigationSubMenuItemID =
| 'application-management-configurations-gitops'
| 'application-management-configurations-git-accounts'
| 'application-management-configurations-external-links'
| 'application-management-configurations-chart-repository'
| 'application-management-configurations-deployment-charts'
| 'application-management-configurations-notifications'
| 'application-management-configurations-catalog-frameworks'
| 'application-management-configurations-scoped-variables'
| 'application-management-configurations-build-infra'
| 'application-management-policies-deployment-window'
| 'application-management-policies-approval-policy'
| 'application-management-policies-plugin-policy'
| 'application-management-policies-pull-image-digest'
| 'application-management-policies-tag-policy'
| 'application-management-policies-filter-conditions'
| 'application-management-policies-image-promotion'
| 'application-management-policies-lock-deployment-configuration'
| 'cost-visibility-cost-breakdown-clusters'
| 'cost-visibility-cost-breakdown-environments'
| 'cost-visibility-cost-breakdown-projects'
| 'cost-visibility-cost-breakdown-applications'
| 'global-configuration-authorization-user-permissions'
| 'global-configuration-authorization-permission-groups'
| 'global-configuration-authorization-api-tokens'
import { NavigationItemID, NavigationSubMenuItemID } from '@PagesDevtron2.0/Navigation'

export interface GetUserPreferencesQueryParamsType {
key: typeof USER_PREFERENCES_ATTRIBUTE_KEY
Expand Down