Merge branch 'release/6.9' into cherrypick-1249-692

cdapio · Oct 29, 2024 · d68a801 · d68a801
2 parents 8b60600 + 6b84f48
commit d68a801
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 5 deletions.
diff --git 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 (
     <div className="run-number-container run-info-container">
-      <h4 className="run-number">
+      <h4
+        className="run-number"
+        title={
+          runLimit > 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
@@ -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/pom.xml b/pom.xml
@@ -23,7 +23,7 @@
   <parent>
     <groupId>io.cdap.cdap</groupId>
     <artifactId>cdap</artifactId>
-    <version>6.9.6-SNAPSHOT</version>
+    <version>6.9.6</version>
   </parent>
 
   <artifactId>cdap-ui</artifactId>
@@ -254,16 +254,16 @@
           <plugin>
             <groupId>com.github.eirslett</groupId>
             <artifactId>frontend-maven-plugin</artifactId>
-            <version>1.11.0</version>
+            <version>1.15.0</version>
             <executions>
               <execution>
                 <id>dist</id>
                 <goals>
                   <goal>install-node-and-yarn</goal>
                 </goals>
                 <configuration>
-                  <nodeVersion>v16.16.0</nodeVersion>
-                  <yarnVersion>v1.7.0</yarnVersion>
+                  <nodeVersion>v16.20.0</nodeVersion>
+                  <yarnVersion>v1.22.19</yarnVersion>
                 </configuration>
               </execution>
               <execution>

diff --git 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',