Patch 3 0 3 (#115)

Fix graph in 3.0.4
camunda-community-hub · May 9, 2023 · d8f2728 · d8f2728
1 parent abfa565
commit d8f2728
Show file tree

Hide file tree

Showing 5 changed files with 21 additions and 12 deletions.
diff --git a/pom.xml b/pom.xml
@@ -4,7 +4,7 @@
 
   <groupId>io.camunda.community</groupId>
   <artifactId>zeebe-cherry-runtime</artifactId>
-  <version>3.0.3-SNAPSHOT</version>
+  <version>3.0.4</version>
 
   <properties>
     <java.version>17</java.version>

diff --git a/src/main/frontend/src/component/Chart.jsx b/src/main/frontend/src/component/Chart.jsx
@@ -134,6 +134,7 @@ class Chart extends React.Component {
   getOptionsBarChart() {
     const chartOptions = {
       'maintainAspectRatio': false,
+      'responsive': false,
       'plugins': {
         'legend': {
           'display': false
@@ -145,7 +146,7 @@ class Chart extends React.Component {
         y: {
           ticks: {
             beginAtZero: true,
-            display: false
+            display: true
           },
           grid: {
             display: false,
@@ -168,7 +169,6 @@ class Chart extends React.Component {
           borderWidth: 2,
         },
       };
-      chartOptions.responsive = true;
       chartOptions.plugins = {
         legend: {
           position: 'right',
@@ -187,6 +187,7 @@ class Chart extends React.Component {
     if (this.state.options.width !== undefined || this.state.options.height !== undefined) {
       chartOptions.maintainAspectRatio = false;
     }
+    // value is true by default
     if (this.state.options.showXLabel === false) {
       chartOptions.scales.x.ticks.display = false;
     }
@@ -268,7 +269,7 @@ class Chart extends React.Component {
       dataset.data = this.state.data;
     }
     console.log("Chart: dataChart=" + JSON.stringify(dataChart));
-
+    return dataChart;
   }
 
   /* ******************************************************************** */

diff --git a/src/main/frontend/src/dashboard/Dashboard.jsx b/src/main/frontend/src/dashboard/Dashboard.jsx
@@ -157,7 +157,7 @@ class Dashboard extends React.Component {
                 <td style={{verticalAlign: "top"}}>
                   <RunnerDashboard runnerDisplay={runner} timestamp={this.state.dashboard.timestamp}/></td>
                 <td style={{verticalAlign: "top"}}>
-                  <RunnerChart type="Executions" runnerDisplay={runner} title={false}
+                  <RunnerChart type="ExecutionsShort" runnerDisplay={runner} title={false}
                                timestamp={this.state.dashboard.timestamp}/>
                 </td>
               </tr>

diff --git a/src/main/frontend/src/dashboard/RunnerChart.jsx b/src/main/frontend/src/dashboard/RunnerChart.jsx
@@ -42,43 +42,51 @@ class RunnerChart extends React.Component {
                  options={{
                    title: this.state.title,
                    showXLabel: false,
-                   showYLabel: false,
+                   showYLabel: true,
                    width: 200,
                    height: 100,
                    showGrid: false
                  }}
                  title="execution"/>
         }
+        {this.state.type === "ExecutionsShort" && this.state.runner && this.state.runner.performance &&
+          <Chart type="HorizontalBar" dataList={this.getExecutions()} oneColor={true}
+                 options={{
+                   showXLabel: false,
+                   showYLabel: false,
+                   showGrid: false
+                 }}/>
+        }
         {this.state.type === "DurationsAvg" && this.state.runner && this.state.runner.performance &&
           <Chart type="HorizontalBar" dataList={this.getDurationsAvg()} oneColor={true}
                  options={{
                    title: this.state.title,
                    showXLabel: false,
-                   showYLabel: false,
+                   showYLabel: true,
                    width: 200,
                    height: 100,
                    showGrid: false
                  }}
-                 title="Duration (average)"/>
+                 title="Duration ms (average)"/>
         }
         {this.state.type === "DurationsPic" && this.state.runner && this.state.runner.performance &&
           <Chart type="HorizontalBar" dataList={this.getDurationsPic()} oneColor={true}
                  options={{
                    title: this.state.title,
                    showXLabel: false,
-                   showYLabel: false,
+                   showYLabel: true,
                    width: 200,
                    height: 100,
                    showGrid: false
                  }}
-                 title="Duration (pic)"/>
+                 title="Duration ms (pic)"/>
         }
         {this.state.type === "Errors" && this.state.runner && this.state.runner.performance &&
           <Chart type="HorizontalBar" dataList={this.getErrors()} oneColor={true}
                  options={{
                    title: this.state.title,
                    showXLabel: false,
-                   showYLabel: false,
+                   showYLabel: true,
                    width: 200,
                    height: 100,
                    showGrid: false

diff --git a/src/main/frontend/src/parameter/Parameters.jsx b/src/main/frontend/src/parameter/Parameters.jsx
@@ -137,7 +137,7 @@ class Parameters extends React.Component {
         <h4>Workers</h4>
         <div className="row">
           <div className="col-md-12">
-            <NumberInput label="Threads"
+            <NumberInput label="Max job actives"
                          readonly="true"
                          min="1"
                          size="sm"