From 42d8103818af905c1ba69d664d33cc1618e0b520 Mon Sep 17 00:00:00 2001 From: Yomi Eluwande Date: Wed, 13 Apr 2022 18:11:14 +0200 Subject: [PATCH 1/4] Add parca/store to list of dependencies for parca/components --- ui/packages/app/web/package.json | 4 ++-- ui/packages/shared/components/package.json | 1 + ui/yarn.lock | 15 --------------- 3 files changed, 3 insertions(+), 17 deletions(-) diff --git a/ui/packages/app/web/package.json b/ui/packages/app/web/package.json index db3f8df788e..a314af079a2 100644 --- a/ui/packages/app/web/package.json +++ b/ui/packages/app/web/package.json @@ -48,7 +48,7 @@ "lodash.throttle": "^4.1.1", "moment": "^2.29.1", "postcss": "^8.4.5", - "react-dom": "^18.0.0", + "react-dom": "^17.0.2", "react-router-dom": "^6.2.1", "react-use": "^17.3.2", "tailwindcss": "^3.0.1", @@ -75,7 +75,7 @@ "jest": "^27.4.7", "jest-runtime": "^27.3.1", "pm2": "^5.1.2", - "react-dom": "^18.0.0", + "react-dom": "^17.0.2", "react-scripts": "^5.0.0", "sass": "^1.43.2", "sass-loader": "^12.2.0", diff --git a/ui/packages/shared/components/package.json b/ui/packages/shared/components/package.json index 7a19fe62b06..976141a8ee7 100644 --- a/ui/packages/shared/components/package.json +++ b/ui/packages/shared/components/package.json @@ -15,6 +15,7 @@ "@parca/icons": "^0.12.2", "@parca/parser": "^0.12.3", "@parca/profile": "^0.12.20", + "@parca/store": "^0.12.14", "@types/react-datepicker": "^4.4.0", "classnames": "^2.3.1", "google-protobuf": "^3.19.0", diff --git a/ui/yarn.lock b/ui/yarn.lock index 391aaf01984..003811c27b4 100644 --- a/ui/yarn.lock +++ b/ui/yarn.lock @@ -17511,14 +17511,6 @@ react-dom@^17.0.2: object-assign "^4.1.1" scheduler "^0.20.2" -react-dom@^18.0.0: - version "18.0.0" - resolved "https://registry.yarnpkg.com/react-dom/-/react-dom-18.0.0.tgz#26b88534f8f1dbb80853e1eabe752f24100d8023" - integrity sha512-XqX7uzmFo0pUceWFCt7Gff6IyIMzFUn7QMZrbrQfGxtaxXZIcGQzoNpRLE3fQLnS4XzLLPMZX2T9TRcSrasicw== - dependencies: - loose-envify "^1.1.0" - scheduler "^0.21.0" - react-draggable@^4.4.3: version "4.4.4" resolved "https://registry.yarnpkg.com/react-draggable/-/react-draggable-4.4.4.tgz#5b26d9996be63d32d285a426f41055de87e59b2f" @@ -18566,13 +18558,6 @@ scheduler@^0.20.2: loose-envify "^1.1.0" object-assign "^4.1.1" -scheduler@^0.21.0: - version "0.21.0" - resolved "https://registry.yarnpkg.com/scheduler/-/scheduler-0.21.0.tgz#6fd2532ff5a6d877b6edb12f00d8ab7e8f308820" - integrity sha512-1r87x5fz9MXqswA2ERLo0EbOAU74DpIUO090gIasYTqlVoJeMcl+Z1Rg7WHz+qtPujhS/hGIt9kxZOYBV3faRQ== - dependencies: - loose-envify "^1.1.0" - schema-utils@2.7.0: version "2.7.0" resolved "https://registry.yarnpkg.com/schema-utils/-/schema-utils-2.7.0.tgz#17151f76d8eae67fbbf77960c33c676ad9f4efc7" From a73c4b108df333bd96b1c0fb884f42657c01bff5 Mon Sep 17 00:00:00 2001 From: Yomi Eluwande Date: Wed, 13 Apr 2022 18:12:53 +0200 Subject: [PATCH 2/4] ui-v0.12.21 --- ui/CHANGELOG.md | 4 ++++ ui/lerna.json | 2 +- ui/packages/app/web/CHANGELOG.md | 4 ++++ ui/packages/app/web/package.json | 4 ++-- ui/packages/shared/components/CHANGELOG.md | 4 ++++ ui/packages/shared/components/package.json | 2 +- 6 files changed, 16 insertions(+), 4 deletions(-) diff --git a/ui/CHANGELOG.md b/ui/CHANGELOG.md index 6d16db02861..ea59ef4a2be 100644 --- a/ui/CHANGELOG.md +++ b/ui/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.12.21](https://github.com/parca-dev/parca/compare/ui-v0.12.20...ui-v0.12.21) (2022-04-13) + +**Note:** Version bump only for package ui + ## [0.12.20](https://github.com/parca-dev/parca/compare/ui-v0.12.19...ui-v0.12.20) (2022-04-12) ## 0.12.18 (2022-04-12) diff --git a/ui/lerna.json b/ui/lerna.json index e6c45679baf..f55058cd8e6 100644 --- a/ui/lerna.json +++ b/ui/lerna.json @@ -1,5 +1,5 @@ { - "version": "0.12.20", + "version": "0.12.21", "npmClient": "yarn", "tagVersionPrefix": "ui-v", "useWorkspaces": true, diff --git a/ui/packages/app/web/CHANGELOG.md b/ui/packages/app/web/CHANGELOG.md index 6bca7ab2c72..823d8dc1aa1 100644 --- a/ui/packages/app/web/CHANGELOG.md +++ b/ui/packages/app/web/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.12.21](https://github.com/parca-dev/parca/compare/ui-v0.12.20...ui-v0.12.21) (2022-04-13) + +**Note:** Version bump only for package @parca/web + ## [0.12.20](https://github.com/parca-dev/parca/compare/ui-v0.12.19...ui-v0.12.20) (2022-04-12) **Note:** Version bump only for package @parca/web diff --git a/ui/packages/app/web/package.json b/ui/packages/app/web/package.json index a314af079a2..09f394ddf31 100644 --- a/ui/packages/app/web/package.json +++ b/ui/packages/app/web/package.json @@ -1,7 +1,7 @@ { "name": "@parca/web", "private": true, - "version": "0.12.20", + "version": "0.12.21", "description": "Parca Web Interface", "scripts": { "lint": "eslint --no-error-on-unmatched-pattern --ext .ts,.tsx,.js src/*", @@ -26,7 +26,7 @@ "@headlessui/react": "^1.4.3", "@heroicons/react": "^1.0.5", "@parca/client": "^0.12.20", - "@parca/components": "^0.12.20", + "@parca/components": "^0.12.21", "@parca/dynamicsize": "^0.12.0", "@parca/functions": "^0.12.15", "@parca/icons": "^0.12.2", diff --git a/ui/packages/shared/components/CHANGELOG.md b/ui/packages/shared/components/CHANGELOG.md index 8b8f2b2ce32..b6b529e0a57 100644 --- a/ui/packages/shared/components/CHANGELOG.md +++ b/ui/packages/shared/components/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.12.21](https://github.com/parca-dev/parca/compare/ui-v0.12.20...ui-v0.12.21) (2022-04-13) + +**Note:** Version bump only for package @parca/components + ## [0.12.20](https://github.com/parca-dev/parca/compare/ui-v0.12.19...ui-v0.12.20) (2022-04-12) **Note:** Version bump only for package @parca/components diff --git a/ui/packages/shared/components/package.json b/ui/packages/shared/components/package.json index 976141a8ee7..c6f7f68380c 100644 --- a/ui/packages/shared/components/package.json +++ b/ui/packages/shared/components/package.json @@ -1,6 +1,6 @@ { "name": "@parca/components", - "version": "0.12.20", + "version": "0.12.21", "description": "A component library for Parca", "main": "src/index.tsx", "scripts": { From 86c658d1bdf682750bf90bc403ced7f93e171f1b Mon Sep 17 00:00:00 2001 From: Yomi Eluwande Date: Wed, 13 Apr 2022 19:19:44 +0200 Subject: [PATCH 3/4] Add redux store to ProfileExplorer --- .../components/src/ProfileExplorer/index.tsx | 22 ++++++++++++++++++- 1 file changed, 21 insertions(+), 1 deletion(-) diff --git a/ui/packages/shared/components/src/ProfileExplorer/index.tsx b/ui/packages/shared/components/src/ProfileExplorer/index.tsx index ffaf37d02c8..ed1cfc5aac7 100644 --- a/ui/packages/shared/components/src/ProfileExplorer/index.tsx +++ b/ui/packages/shared/components/src/ProfileExplorer/index.tsx @@ -4,6 +4,8 @@ import ProfileExplorerSingle from './ProfileExplorerSingle'; import ProfileExplorerCompare from './ProfileExplorerCompare'; import {QueryServiceClient} from '@parca/client'; import {useAppSelector, useAppDispatch, setCompare, selectCompareMode} from '@parca/store'; +import {Provider} from 'react-redux'; +import {store} from '@parca/store'; export type NavigateFunction = (path: string, queryParams: any) => void; @@ -18,7 +20,7 @@ const getExpressionAsAString = (expression: string | []) => { return x; }; -const ProfileExplorer = ({ +const ProfileExplorerApp = ({ queryClient, queryParams, navigateTo, @@ -290,4 +292,22 @@ const ProfileExplorer = ({ ); }; +const ProfileExplorer = ({ + queryClient, + queryParams, + navigateTo, +}: ProfileExplorerProps): JSX.Element => { + const {store: reduxStore} = store(); + + return ( + + + + ); +}; + export default ProfileExplorer; From 1ec2b0f9545121406e0bcef4ada3aa01a7b409a7 Mon Sep 17 00:00:00 2001 From: Yomi Eluwande Date: Wed, 13 Apr 2022 19:21:21 +0200 Subject: [PATCH 4/4] ui-v0.12.22 --- ui/CHANGELOG.md | 4 ++++ ui/lerna.json | 2 +- ui/packages/app/web/CHANGELOG.md | 4 ++++ ui/packages/app/web/package.json | 4 ++-- ui/packages/shared/components/CHANGELOG.md | 4 ++++ ui/packages/shared/components/package.json | 2 +- 6 files changed, 16 insertions(+), 4 deletions(-) diff --git a/ui/CHANGELOG.md b/ui/CHANGELOG.md index ea59ef4a2be..8db8b667758 100644 --- a/ui/CHANGELOG.md +++ b/ui/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.12.22](https://github.com/parca-dev/parca/compare/ui-v0.12.21...ui-v0.12.22) (2022-04-13) + +**Note:** Version bump only for package ui + ## [0.12.21](https://github.com/parca-dev/parca/compare/ui-v0.12.20...ui-v0.12.21) (2022-04-13) **Note:** Version bump only for package ui diff --git a/ui/lerna.json b/ui/lerna.json index f55058cd8e6..33a2dda58cc 100644 --- a/ui/lerna.json +++ b/ui/lerna.json @@ -1,5 +1,5 @@ { - "version": "0.12.21", + "version": "0.12.22", "npmClient": "yarn", "tagVersionPrefix": "ui-v", "useWorkspaces": true, diff --git a/ui/packages/app/web/CHANGELOG.md b/ui/packages/app/web/CHANGELOG.md index 823d8dc1aa1..383d6f7a9e9 100644 --- a/ui/packages/app/web/CHANGELOG.md +++ b/ui/packages/app/web/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.12.22](https://github.com/parca-dev/parca/compare/ui-v0.12.21...ui-v0.12.22) (2022-04-13) + +**Note:** Version bump only for package @parca/web + ## [0.12.21](https://github.com/parca-dev/parca/compare/ui-v0.12.20...ui-v0.12.21) (2022-04-13) **Note:** Version bump only for package @parca/web diff --git a/ui/packages/app/web/package.json b/ui/packages/app/web/package.json index 09f394ddf31..40f19be0c6d 100644 --- a/ui/packages/app/web/package.json +++ b/ui/packages/app/web/package.json @@ -1,7 +1,7 @@ { "name": "@parca/web", "private": true, - "version": "0.12.21", + "version": "0.12.22", "description": "Parca Web Interface", "scripts": { "lint": "eslint --no-error-on-unmatched-pattern --ext .ts,.tsx,.js src/*", @@ -26,7 +26,7 @@ "@headlessui/react": "^1.4.3", "@heroicons/react": "^1.0.5", "@parca/client": "^0.12.20", - "@parca/components": "^0.12.21", + "@parca/components": "^0.12.22", "@parca/dynamicsize": "^0.12.0", "@parca/functions": "^0.12.15", "@parca/icons": "^0.12.2", diff --git a/ui/packages/shared/components/CHANGELOG.md b/ui/packages/shared/components/CHANGELOG.md index b6b529e0a57..9d61551c399 100644 --- a/ui/packages/shared/components/CHANGELOG.md +++ b/ui/packages/shared/components/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.12.22](https://github.com/parca-dev/parca/compare/ui-v0.12.21...ui-v0.12.22) (2022-04-13) + +**Note:** Version bump only for package @parca/components + ## [0.12.21](https://github.com/parca-dev/parca/compare/ui-v0.12.20...ui-v0.12.21) (2022-04-13) **Note:** Version bump only for package @parca/components diff --git a/ui/packages/shared/components/package.json b/ui/packages/shared/components/package.json index c6f7f68380c..ed6459a69f2 100644 --- a/ui/packages/shared/components/package.json +++ b/ui/packages/shared/components/package.json @@ -1,6 +1,6 @@ { "name": "@parca/components", - "version": "0.12.21", + "version": "0.12.22", "description": "A component library for Parca", "main": "src/index.tsx", "scripts": {