Bumped version to 3.3.6

instana · May 3, 2023 · 9c7c13f · 9c7c13f
1 parent 793a66e
commit 9c7c13f
Show file tree

Hide file tree

Showing 9 changed files with 31 additions and 8 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,8 @@
 # Changelog
 
+## 3.3.6
+- fix available metrics in Analyze websites
+
 ## 3.3.5
 - fix docs url for dynamic focus query
 

diff --git a/dist/CHANGELOG.md b/dist/CHANGELOG.md
@@ -1,8 +1,15 @@
 # Changelog
 
+## 3.3.6
+- fix available metrics in Analyze websites
+
+## 3.3.5
+- fix docs url for dynamic focus query
+
 ## 3.3.4
 - encode infrastructure metrics to support custom metrics including special characters
 - fix datasource configuration with instana urls ending with `/`
+
 ## 3.3.3
 - adjust supported granularites for analyze queries to match Instana UI for better comparability
     - removed: `5h`, `10h`

diff --git a/dist/module.js b/dist/module.js
diff --git a/dist/module.js.map b/dist/module.js.map
diff --git a/dist/plugin.json b/dist/plugin.json
@@ -39,8 +39,8 @@
       {"name": "query", "path": "img/query.png"},
       {"name": "slo", "path": "img/slo.png"}
     ],
-    "version": "3.3.5",
-    "updated": "2023-01-20"
+    "version": "3.3.6",
+    "updated": "2023-05-03"
   },
   "routes": [
     {

diff --git a/src/components/Analyze/WebsiteMetrics.tsx b/src/components/Analyze/WebsiteMetrics.tsx
@@ -77,7 +77,9 @@ export class WebsiteMetrics extends React.Component<Props, WebsiteMetricsState>
 
     datasource.dataSourceWebsite.getWebsiteMetricsCatalog().then((websiteMetrics: any) => {
       if (!isUnmounting) {
-        this.props.updateMetrics(_.filter(websiteMetrics, (m) => m.beaconTypes.includes(query.entityType.key)));
+        // store all available metrics first and filter by type afterwards
+        this.props.updateMetrics(websiteMetrics);
+        this.props.filterMetricsOnType(query.entityType.key);
       }
     });
   }

diff --git a/src/components/QueryEditor.tsx b/src/components/QueryEditor.tsx
@@ -503,7 +503,7 @@ export class QueryEditor extends PureComponent<Props, QueryState> {
           loadEntityTypes={this.loadEntityTypes}
         />
 
-        <Badge text={'3.3.5'} color={'blue'} />
+        <Badge text={'3.3.6'} color={'blue'} />
       </div>
     );
   }

diff --git a/src/datasources/DataSource_Website.test.ts b/src/datasources/DataSource_Website.test.ts
@@ -46,10 +46,21 @@ describe('Given a website datasource', () => {
             aggregations: ['MEAN', 'SUM'],
             beaconTypes: ['pageLoad', 'resourceLoad', 'httpRequest', 'error', 'custom', 'pageChange'],
           },
+          {
+            metricId: 'singleId',
+            label: 'single',
+            aggregations: ['MEAN'],
+            beaconTypes: ['httpRequest'],
+          },
+          {
+            metricId: 'noArrayId',
+            label: 'noArrays',
+          },
         ],
       });
 
       return dataSourceWebsite.getWebsiteMetricsCatalog().then((catalog: any) => {
+        expect(catalog).toHaveLength(3);
         return _.map(catalog, (metric) => {
           expect(metric).toHaveProperty('key');
           expect(metric).toHaveProperty('label');

diff --git a/src/plugin.json b/src/plugin.json
@@ -39,8 +39,8 @@
       {"name": "query", "path": "img/query.png"},
       {"name": "slo", "path": "img/slo.png"}
     ],
-    "version": "3.3.5",
-    "updated": "2023-01-20"
+    "version": "3.3.6",
+    "updated": "2023-05-03"
   },
   "routes": [
     {
-Original file line number
+Diff line change
@@ Expand Up @@
               loadEntityTypes={this.loadEntityTypes}
             />
-            <Badge text={'3.3.5'} color={'blue'} />
+            <Badge text={'3.3.6'} color={'blue'} />
           </div>
         );
       }
@@ Expand Down @@