Merge branch 'main' of github.com:devtron-labs/devtron-fe-common-lib into chore/ts-and-vite-upgrade

Author: eshankvaish

src/Shared/Components/CICDHistory/Artifacts.tsx

@@ -179,7 +179,11 @@ const Artifacts = ({
             </div>
         )
     }
-    if (status.toLowerCase() === TERMINAL_STATUS_MAP.FAILED || status.toLowerCase() === TERMINAL_STATUS_MAP.CANCELLED) {
+    if (
+        status.toLowerCase() === TERMINAL_STATUS_MAP.FAILED ||
+        status.toLowerCase() === TERMINAL_STATUS_MAP.CANCELLED ||
+        status.toLowerCase() === TERMINAL_STATUS_MAP.ERROR
+    ) {
         if (isJobCI) {
             return (
                 <GenericEmptyState

src/Shared/Components/MaterialHistory/MaterialHistory.component.tsx

@@ -59,7 +59,7 @@ const MaterialHistory = ({
                 const historyList = materialHistoryMapWithTime[date]
                 return (
                     <>
-                        {!isCommitInfoModal && (
+                        {!isCommitInfoModal && material.type !== SourceTypeMap.WEBHOOK && (
                             <div className="flex left dc__gap-8">
                                 <span className="fs-12 lh-18 cn-7 fw-6 w-130">{date}</span>
                                 <div className="h-1 bcn-2 w-100" />