Merge remote-tracking branch 'origin/stable'

niledatabase · Nov 23, 2022 · fd5d7bc · fd5d7bc · vercel · Nov 23, 2022
2 parents 7de3830 + 52e64ce
commit fd5d7bc
Show file tree

Hide file tree

Showing 9 changed files with 37 additions and 11 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -3,6 +3,12 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [0.32.3](https://github.com/TheNileDev/nile-js/compare/v0.32.2...v0.32.3) (2022-11-23)
+
+### Bug Fixes
+
+- **react:** update AggregateMetricsRequest type ([245c528](https://github.com/TheNileDev/nile-js/commit/245c5288e3f47db1a76a264fb6ddd1874c68f71c))
+
 ## [0.32.2](https://github.com/TheNileDev/nile-js/compare/v0.32.1...v0.32.2) (2022-11-23)
 
 ### Bug Fixes

diff --git a/lerna.json b/lerna.json
@@ -1,6 +1,6 @@
 {
   "packages": ["lib/*", "packages/react"],
-  "version": "0.32.2",
+  "version": "0.32.3",
   "npmClient": "yarn",
   "useWorkspaces": true,
   "command": {

diff --git a/lib/nile/CHANGELOG.md b/lib/nile/CHANGELOG.md
@@ -3,6 +3,10 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [0.32.3](https://github.com/TheNileDev/nile-js/compare/v0.32.2...v0.32.3) (2022-11-23)
+
+**Note:** Version bump only for package @theniledev/js
+
 ## [0.32.2](https://github.com/TheNileDev/nile-js/compare/v0.32.1...v0.32.2) (2022-11-23)
 
 **Note:** Version bump only for package @theniledev/js

diff --git a/lib/nile/package.json b/lib/nile/package.json
@@ -1,5 +1,5 @@
 {
-  "version": "0.32.2",
+  "version": "0.32.3",
   "license": "MIT",
   "main": "dist/index.js",
   "typings": "dist/index.d.ts",

diff --git a/packages/examples/CHANGELOG.md b/packages/examples/CHANGELOG.md
@@ -3,6 +3,10 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [0.32.3](https://github.com/TheNileDev/nile-js/compare/v0.32.2...v0.32.3) (2022-11-23)
+
+**Note:** Version bump only for package @theniledev/examples
+
 ## [0.32.2](https://github.com/TheNileDev/nile-js/compare/v0.32.1...v0.32.2) (2022-11-23)
 
 **Note:** Version bump only for package @theniledev/examples

diff --git a/packages/examples/package.json b/packages/examples/package.json
@@ -2,7 +2,7 @@
   "name": "@theniledev/examples",
   "license": "MIT",
   "private": true,
-  "version": "0.32.2",
+  "version": "0.32.3",
   "scripts": {
     "dev": "next dev",
     "build": "next build",

diff --git a/packages/react/CHANGELOG.md b/packages/react/CHANGELOG.md
@@ -3,6 +3,12 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [0.32.3](https://github.com/TheNileDev/nile-js/compare/v0.32.2...v0.32.3) (2022-11-23)
+
+### Bug Fixes
+
+- **react:** update AggregateMetricsRequest type ([245c528](https://github.com/TheNileDev/nile-js/commit/245c5288e3f47db1a76a264fb6ddd1874c68f71c))
+
 ## [0.32.2](https://github.com/TheNileDev/nile-js/compare/v0.32.1...v0.32.2) (2022-11-23)
 
 ### Bug Fixes

diff --git a/packages/react/package.json b/packages/react/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@theniledev/react",
-  "version": "0.32.2",
+  "version": "0.32.3",
   "license": "MIT",
   "main": "dist/index.js",
   "typings": "dist/index.d.ts",
@@ -90,7 +90,7 @@
     "@mui/x-data-grid": "^5.17.12",
     "@mui/x-date-pickers": "^5.0.8",
     "@tanstack/react-query": "^4.16.1",
-    "@theniledev/js": "^0.32.2",
+    "@theniledev/js": "^0.32.3",
     "chart.js": "^3.9.1",
     "chartjs-adapter-date-fns": "^2.0.1",
     "date-fns": "^2.29.3",

diff --git a/packages/react/src/components/Metrics/types.ts b/packages/react/src/components/Metrics/types.ts
@@ -38,12 +38,18 @@ export enum AggregationType {
   P95 = 'percentile95',
 }
 
-export type AggregateMetricsRequest = Omit<
-  NileAggregateMetricsRequest['aggregationRequest'],
-  'startTime'
-> & {
-  aggregationType: AggregationType;
-};
+type Optional<T, K extends keyof T> = Pick<Partial<T>, K> & Omit<T, K>;
+type ChangeFields<T, R> = Omit<T, keyof R> & R;
+
+export type AggregateMetricsRequest = ChangeFields<
+  NileAggregateMetricsRequest,
+  {
+    aggregationRequest: Optional<
+      NileAggregateMetricsRequest['aggregationRequest'],
+      'startTime'
+    >;
+  }
+> & { aggregationType: AggregationType };
 
 export enum DataKeys {
   timestamp = 'timestamp',