Merge pull request #1033 from devtron-labs/feat/audit-logs-ui

chore: File log search icon added

Author: shivani170

package-lock.json

@@ -1,6 +1,6 @@
 {
     "name": "@devtron-labs/devtron-fe-common-lib",
-    "version": "4.0.7",
+    "version": "4.0.8",
     "description": "Supporting common component library",
     "type": "module",
     "main": "dist/index.js",

package.json

@@ -78,6 +78,7 @@ export type NavigationRootItemID =
     | 'automation-and-enablement'
     | 'data-protection-management'
     | 'global-configuration'
+    | 'audit-logs'
 
 export type CommonNavigationItemType = {
     title: string
@@ -107,11 +108,19 @@ export type NavigationItemType = Pick<
           })
     )
 
-export interface NavigationGroupType extends Pick<
+export type NavigationGroupType = Pick<
     CommonNavigationItemType,
     'title' | 'icon' | 'hideNav' | 'forceHideEnvKey' | 'isAvailableInEA'
-> {
+> & {
     id: NavigationRootItemID
-    items: NavigationItemType[]
     disabled?: boolean
-}
+} & (
+        | {
+              items: NavigationItemType[]
+              href?: never
+          }
+        | {
+              items?: never
+              href: string
+          }
+    )

src/Assets/IconV2/ic-file-log-search.svg

@@ -1,7 +1,7 @@
 import { generatePath } from 'react-router-dom'
 
 import { InfrastructureManagementAppListType } from '@Common/Types'
-import { CostBreakdownItemViewParamsType, CostBreakdownViewType } from '@PagesDevtron2.0/index'
+import { CostBreakdownItemViewParamsType, CostBreakdownViewType } from '@PagesDevtron2.0/CostVisibility/Shared/types'
 
 const OVERVIEW = 'overview'
 
@@ -279,6 +279,9 @@ export const BASE_ROUTES = {
             DETAIL: ':locationId',
         },
     },
+    AUDIT_LOGS: {
+        ROOT: 'audit-logs',
+    },
     GLOBAL_CONFIG: {
         ROOT: 'global-configuration',
         HOST_URL: 'host-url',
@@ -415,6 +418,7 @@ const JOBS_ROOT =
 const JOB_DETAIL_ROOT = `${JOBS_ROOT}/${BASE_ROUTES.AUTOMATION_AND_ENABLEMENT.JOBS.DETAIL.ROOT}` as const
 
 const DATA_PROTECTION_MANAGEMENT_ROOT = `/${BASE_ROUTES.DATA_PROTECTION_MANAGEMENT.ROOT}` as const
+const AUDIT_LOGS_ROOT = `/${BASE_ROUTES.AUDIT_LOGS.ROOT}` as const
 const GLOBAL_CONFIG_ROOT = `/${BASE_ROUTES.GLOBAL_CONFIG.ROOT}` as const
 const GLOBAL_CONFIG_AUTH_ROOT = `${GLOBAL_CONFIG_ROOT}/${BASE_ROUTES.GLOBAL_CONFIG.AUTH.ROOT}` as const
 const NETWORK_STATUS_INTERFACE_ROOT = `/${BASE_ROUTES.NETWORK_STATUS_INTERFACE.ROOT}` as const
@@ -675,7 +679,9 @@ export const ROUTER_URLS = {
     DATA_PROTECTION_MANAGEMENT_BACKUP_LOCATIONS: `${DATA_PROTECTION_MANAGEMENT_ROOT}/${BASE_ROUTES.DATA_PROTECTION_MANAGEMENT.BACKUP_LOCATIONS.ROOT}`,
     DATA_PROTECTION_MANAGEMENT_BACKUP_LOCATIONS_DETAIL: `${DATA_PROTECTION_MANAGEMENT_ROOT}/${BASE_ROUTES.DATA_PROTECTION_MANAGEMENT.BACKUP_LOCATIONS.ROOT}/${BASE_ROUTES.DATA_PROTECTION_MANAGEMENT.BACKUP_LOCATIONS.DETAIL}`,
 
-    // Global Config
+    // Audit Logs
+    AUDIT_LOGS: AUDIT_LOGS_ROOT,
+
     GLOBAL_CONFIG_HOST_URL: `${GLOBAL_CONFIG_ROOT}/${BASE_ROUTES.GLOBAL_CONFIG.HOST_URL}`,
     GLOBAL_CONFIG_EXTERNAL_LINKS: `${GLOBAL_CONFIG_ROOT}/${BASE_ROUTES.GLOBAL_CONFIG.EXTERNAL_LINKS}`,
     GLOBAL_CONFIG_CHART_REPOSITORIES: `${GLOBAL_CONFIG_ROOT}/${BASE_ROUTES.GLOBAL_CONFIG.CHART_REPOSITORIES}`,

src/Pages-Devtron-2.0/Navigation/types.ts

@@ -104,7 +104,10 @@ const DateTimePicker = ({
         onChange(updateTime(dateObject, option.value).value)
     }
 
-    const handleDateRangeChange = (range: DateRange) => {
+    const handleDateRangeChange = (range: DateRange | undefined) => {
+        if (!range) {
+            return
+        }
         if (isDateUpdateRange(isRangePicker, onChange)) {
             const fromDate = range.from ? range.from : new Date()
             const toDate = range.to ? range.to : undefined

src/Pages-Devtron-2.0/Shared/Routes/routes.ts

@@ -149,6 +149,7 @@ import ICFileCode from '@IconsV2/ic-file-code.svg?react'
 import ICFileDownload from '@IconsV2/ic-file-download.svg?react'
 import ICFileEdit from '@IconsV2/ic-file-edit.svg?react'
 import ICFileKey from '@IconsV2/ic-file-key.svg?react'
+import ICFileLogSearch from '@IconsV2/ic-file-log-search.svg?react'
 import ICFiles from '@IconsV2/ic-files.svg?react'
 import ICFilesChanged from '@IconsV2/ic-files-changed.svg?react'
 import ICFilter from '@IconsV2/ic-filter.svg?react'
@@ -492,6 +493,7 @@ export const iconMap = {
     'ic-file-download': ICFileDownload,
     'ic-file-edit': ICFileEdit,
     'ic-file-key': ICFileKey,
+    'ic-file-log-search': ICFileLogSearch,
     'ic-file': ICFile,
     'ic-files-changed': ICFilesChanged,
     'ic-files': ICFiles,

src/Shared/Components/DatePicker/DateTimePicker.tsx

@@ -17,7 +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'
-import { NavigationItemID, NavigationSubMenuItemID } from '@PagesDevtron2.0/Navigation'
+import { NavigationItemID, NavigationRootItemID, NavigationSubMenuItemID } from '@PagesDevtron2.0/Navigation'
 
 export interface GetUserPreferencesQueryParamsType {
     key: typeof USER_PREFERENCES_ATTRIBUTE_KEY
@@ -78,7 +78,9 @@ export interface GetUserPreferencesParsedDTO {
      */
     resources?: UserPreferenceResourceType
     commandBar: {
-        recentNavigationActions: { id: NavigationItemID | NavigationSubMenuItemID | CommandBarAdditionalItemsId }[]
+        recentNavigationActions: {
+            id: NavigationItemID | NavigationRootItemID | NavigationSubMenuItemID | CommandBarAdditionalItemsId
+        }[]
     }
 }
 export interface UserPreferencesPayloadValueType extends GetUserPreferencesParsedDTO {}