From 6718670e25822940022c9ae926366a3dbff04381 Mon Sep 17 00:00:00 2001 From: GnsP Date: Tue, 9 Jul 2024 12:28:46 +0530 Subject: [PATCH 1/3] upgrade frontend-maven-plugin, node and yarn versions --- pom.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pom.xml b/pom.xml index 23d23f7576e..8e45152a68d 100644 --- a/pom.xml +++ b/pom.xml @@ -254,7 +254,7 @@ com.github.eirslett frontend-maven-plugin - 1.11.0 + 1.15.0 dist @@ -262,8 +262,8 @@ install-node-and-yarn - v16.16.0 - v1.7.0 + v16.20.0 + v1.22.19 From f64f48cb154e40cce011b1a523f04ac30db0aa07 Mon Sep 17 00:00:00 2001 From: Radhika Vissamsetty Date: Thu, 1 Aug 2024 19:18:17 +0530 Subject: [PATCH 2/3] Show tooltip for pipeline runs when run.records.ttl is present. --- .../RunLevelInfo/CurrentRunIndex.tsx | 13 ++++++++++++- app/cdap/text/text-en.yaml | 1 + server/express.js | 1 + 3 files changed, 14 insertions(+), 1 deletion(-) diff --git a/app/cdap/components/PipelineDetails/RunLevelInfo/CurrentRunIndex.tsx b/app/cdap/components/PipelineDetails/RunLevelInfo/CurrentRunIndex.tsx index 8c1b6bde15a..e1847eb5219 100644 --- a/app/cdap/components/PipelineDetails/RunLevelInfo/CurrentRunIndex.tsx +++ b/app/cdap/components/PipelineDetails/RunLevelInfo/CurrentRunIndex.tsx @@ -86,6 +86,8 @@ const CurrentRunIndex = ({ runsCount - (runs.length - currentRunIndex) ); + const runLimit = Number(window.CDAP_CONFIG.cdap.runRecordsTtl) || 0; + const pipelineLink = getHydratorUrl({ stateName: 'hydrator.detail', stateParams: { @@ -192,7 +194,16 @@ const CurrentRunIndex = ({ return (
-

+

0 + ? T.translate(`${PREFIX}.tooltipRunLimit`, { + runLimit, + }).toString() + : '' + } + > {T.translate(`${PREFIX}.currentRunIndex`, { currentRunIndex: runIndexInTotalRunsCount + 1, numRuns: runsCount, diff --git a/app/cdap/text/text-en.yaml b/app/cdap/text/text-en.yaml index ec50e35a42d..ca74136945e 100644 --- a/app/cdap/text/text-en.yaml +++ b/app/cdap/text/text-en.yaml @@ -2494,6 +2494,7 @@ features: noInfo: Profile information unavailable runsCurrentlyRunning: Runs currently running - select one to view status: Status + tooltipRunLimit: Pipeline runs for only the last {runLimit} days are displayed warnings: Warnings startTime: Start time TopPanel: diff --git a/server/express.js b/server/express.js index da70316e5c0..e4b94d5ccb9 100644 --- a/server/express.js +++ b/server/express.js @@ -246,6 +246,7 @@ function makeApp(authAddress, cdapConfig, uiSettings) { hstsMaxAge: cdapConfig['hsts.max.age'], hstsIncludeSubDomains: cdapConfig['hsts.include.sub.domains'], hstsPreload: cdapConfig['hsts.preload'], + runRecordsTtl: cdapConfig['app.run.records.ttl.days'], }, hydrator: { previewEnabled: cdapConfig['enable.preview'] === 'true', From 04615a5c6f856a859ab2e3fb4e50e7afec2b440f Mon Sep 17 00:00:00 2001 From: ritwiksahani Date: Thu, 5 Sep 2024 19:02:11 +0530 Subject: [PATCH 3/3] Remove -SNAPSHOT from pom versions. --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 8e45152a68d..4bd09bbbd6d 100644 --- a/pom.xml +++ b/pom.xml @@ -23,7 +23,7 @@ io.cdap.cdap cdap - 6.9.6-SNAPSHOT + 6.9.6 cdap-ui