Merge branch 'develop' of https://github.com/devtron-labs/devtron-fe-common-lib into feat/day-picker

Author: AbhishekA1509

package-lock.json

@@ -1,6 +1,6 @@
 {
     "name": "@devtron-labs/devtron-fe-common-lib",
-    "version": "1.20.6-pre-53",
+    "version": "1.21.0-pre-0",
     "description": "Supporting common component library",
     "type": "module",
     "main": "dist/index.js",
@@ -107,6 +107,7 @@
         "@codemirror/lint": "6.8.4",
         "@codemirror/merge": "^6.10.0",
         "@codemirror/search": "6.5.8",
+        "@datasert/cronjs-parser": "^1.4.0",
         "@lezer/highlight": "1.2.1",
         "@replit/codemirror-indentation-markers": "6.5.3",
         "@replit/codemirror-vscode-keymap": "6.0.2",
@@ -118,6 +119,7 @@
         "ansi_up": "^5.2.1",
         "chart.js": "^4.5.0",
         "codemirror-json-schema": "0.8.0",
+        "cronstrue": "^3.9.0",
         "dayjs": "^1.11.13",
         "fast-json-patch": "^3.1.1",
         "focus-trap-react": "^10.3.1",

package.json

@@ -114,9 +114,7 @@ export const BreadCrumb: React.FC<Breadcrumbs> = ({
                         {breadcrumb.name}
                     </ConditionalWrap>
 
-                    {idx + 1 !== filteredCrumbs.length && breadcrumb.name && (
-                       getBreadCrumbSeparator(sep)
-                    )}
+                    {idx + 1 !== filteredCrumbs.length && breadcrumb.name && getBreadCrumbSeparator(sep)}
                 </React.Fragment>
             ))}
         </>

src/Assets/IconV2/ic-binoculars.svg

@@ -338,6 +338,7 @@ export interface TaskErrorObj {
     name: ErrorObj
     inlineStepDetail?: StepDetailTaskErrorObj
     pluginRefStepDetail?: StepDetailTaskErrorObj
+    outputDirectoryPath?: ErrorObj[]
 }
 export interface FormErrorObjectType {
     name: ErrorObj

src/Assets/IconV2/ic-enter-fullscreen.svg

@@ -65,6 +65,7 @@ const DATA_PROTECTION_BACKUP_AND_SCHEDULE =
     `${DATA_PROTECTION_ROOT}/backup-and-schedule/:view(${Object.values(BackupAndScheduleListViewEnum).join('|')})` as const
 const GLOBAL_CONFIG_ROOT = '/global-configuration'
 const AI_RECOMMENDATIONS_ROOT = '/ai-recommendations'
+const OBSERVABILITY_ROOT = '/observability'
 
 export const URLS = {
     LOGIN: '/login',
@@ -131,7 +132,10 @@ export const URLS = {
     // SECURITY CENTER
     SECURITY_CENTER: SECURITY_CENTER_ROOT,
     SECURITY_CENTER_OVERVIEW: `${SECURITY_CENTER_ROOT}/overview`,
-    SECURITY_CENTER_SCANS: `${SECURITY_CENTER_ROOT}/scans`,
+    SECURITY_CENTER_VULNERABILITIES: `${SECURITY_CENTER_ROOT}/vulnerabilities`,
+    SECURITY_CENTER_VULNERABILITY_DEPLOYMENTS: `${SECURITY_CENTER_ROOT}/vulnerabilities/deployments`,
+    SECURITY_CENTER_VULNERABILITY_CVES: `${SECURITY_CENTER_ROOT}/vulnerabilities/cves`,
+    SECURITY_CENTER_SECURITY_ENABLEMENT: `${SECURITY_CENTER_ROOT}/security-enablement`,
     SECURITY_CENTER_POLICIES: `${SECURITY_CENTER_ROOT}/policies`,
     // AUTOMATION AND ENABLEMENT
     AUTOMATION_AND_ENABLEMENT: AUTOMATION_AND_ENABLEMENT_ROOT,
@@ -154,6 +158,10 @@ export const URLS = {
     AI_RECOMMENDATIONS: AI_RECOMMENDATIONS_ROOT,
     AI_RECOMMENDATIONS_OVERVIEW: `${AI_RECOMMENDATIONS_ROOT}/overview`,
     EXTERNAL_APPS: 'ea',
+    // OBSERVABILITY
+    OBSERVABILITY: OBSERVABILITY_ROOT,
+    OBSERVABILITY_OVERVIEW: `${OBSERVABILITY_ROOT}/overview`,
+    OBSERVABILITY_CUSTOMER_LIST: `${OBSERVABILITY_ROOT}/tenants`,
 } as const
 
 export const ROUTES = {

src/Assets/IconV2/ic-exit-fullscreen.svg

@@ -32,6 +32,7 @@ const SegmentedBarChart: React.FC<SegmentedBarChartProps> = ({
     countClassName,
     labelClassName,
     isProportional,
+    hideTotal,
     swapLegendAndBar = false,
     showAnimationOnBar = false,
     isLoading,
@@ -58,7 +59,7 @@ const SegmentedBarChart: React.FC<SegmentedBarChartProps> = ({
             <div className="shimmer w-64 lh-1-5 h-24" />
         ) : (
             <span className={countClassName} data-testid={`segmented-bar-chart-${label}-value`}>
-                {isProportional ? `${value}/${total}` : value}
+                {isProportional && !hideTotal ? `${value}/${total}` : value}
             </span>
         )
 

src/Common/BreadCrumb/BreadCrumb.tsx

@@ -32,13 +32,23 @@ type EntityPropType =
           entities: NonNullable<Omit<Entity, 'label'> & { label?: never }>[]
       }
 
+type ProportionalType =
+    | {
+          isProportional?: true
+          hideTotal?: boolean
+      }
+    | {
+          isProportional?: false | never
+          hideTotal?: never
+      }
+
 export type SegmentedBarChartProps = {
     rootClassName?: string
     countClassName?: string
     labelClassName?: string
-    isProportional?: boolean
     swapLegendAndBar?: boolean
     showAnimationOnBar?: boolean
     isLoading?: boolean
     size?: ComponentSizeType
-} & EntityPropType
+} & EntityPropType &
+    ProportionalType