diff --git a/package.json b/package.json index 64c276e99..0c77a971b 100644 --- a/package.json +++ b/package.json @@ -50,7 +50,7 @@ "@szhsin/react-menu": "3.5.2", "graphviz-react": "^1.2.5", "jquery": "^3.6.4", - "pyroscope-oss": "git+https://github.com/pyroscope-io/pyroscope.git#e7cf318", + "pyroscope-oss": "git+https://github.com/pyroscope-io/pyroscope.git#bb66096", "react": "^18.2.0", "react-datepicker": "^4.7.0", "react-debounce-input": "^3.2.5", diff --git a/public/app/overrides/components/AppSelector/Label.tsx b/public/app/overrides/components/AppSelector/Label.tsx new file mode 100644 index 000000000..d123bd31b --- /dev/null +++ b/public/app/overrides/components/AppSelector/Label.tsx @@ -0,0 +1,5 @@ +export function Label() { + return <>Profile Type: ; +} + +export const LabelString = 'Select Profile Type'; diff --git a/scripts/webpack/webpack.common.js b/scripts/webpack/webpack.common.js index bd9b5c616..20f2b0f76 100644 --- a/scripts/webpack/webpack.common.js +++ b/scripts/webpack/webpack.common.js @@ -51,6 +51,11 @@ module.exports = { __dirname, '../../public/app/overrides/components/TimelineChart/Tooltip.plugin' ), + '@webapp/components/AppSelector/Label': path.resolve( + __dirname, + '../../public/app/overrides/components/AppSelector/Label' + ), + '@webapp/redux/store': path.resolve( __dirname, '../../public/app/redux/store' diff --git a/tsconfig.json b/tsconfig.json index 1cb861317..a3b7a02c3 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -2,6 +2,7 @@ "baseUrl": ".", "compilerOptions": { "plugins": [{ "name": "typescript-plugin-css-modules" }], + // TODO: unify with webpack.common.js "paths": { "@pyroscope/webapp/*": ["./node_modules/pyroscope-oss/webapp/*"], "@webapp/redux/*": ["./node_modules/pyroscope-oss/webapp/javascript/redux/*"], @@ -12,6 +13,8 @@ "@webapp/components/TimelineChart/TimelineChartWrapper": ["./public/app/overrides/components/TimelineChart/TimelineChartWrapper"], "@webapp/components/TimelineChart/ContextMenu.plugin": ["./public/app/overrides/components/TimelineChart/ContextMenu.plugin"], "@webapp/components/TimelineChart/Tooltip.plugin": ["./public/app/overrides/components/TimelineChart/Tooltip.plugin"], + "@webapp/components/AppSelector/Label": ["./public/app/overrides/components/AppSelector/Label"], + "@webapp/redux/store": ["./public/app/redux/store"], "@webapp/redux/hooks": ["./public/app/redux/hooks"], "@webapp/services/apps": ["./public/app/overrides/services/appNames"], diff --git a/yarn.lock b/yarn.lock index f6ce90a88..b82e4404c 100644 --- a/yarn.lock +++ b/yarn.lock @@ -10130,9 +10130,9 @@ pure-rand@^6.0.0: resolved "https://registry.yarnpkg.com/pure-rand/-/pure-rand-6.0.1.tgz#31207dddd15d43f299fdcdb2f572df65030c19af" integrity sha512-t+x1zEHDjBwkDGY5v5ApnZ/utcd4XYDiJsaQQoptTXgUXX95sDg1elCdJghzicm7n2mbCBJ3uYWr6M22SO19rg== -"pyroscope-oss@git+https://github.com/pyroscope-io/pyroscope.git#e7cf318": +"pyroscope-oss@git+https://github.com/pyroscope-io/pyroscope.git#bb66096": version "0.37.2" - resolved "git+https://github.com/pyroscope-io/pyroscope.git#e7cf318b242c81342c84ae431558a338a14adc87" + resolved "git+https://github.com/pyroscope-io/pyroscope.git#bb66096a7637d20326fd067e73f254983ae4e8ed" dependencies: "@babel/plugin-transform-runtime" "^7.16.4" "@babel/preset-env" "^7.10.4"