Skip to content
This repository has been archived by the owner on Jul 19, 2023. It is now read-only.

Commit

Permalink
Merge pull request #629 from grafana/chore/replace-apps-for-profileID
Browse files Browse the repository at this point in the history
chore: replace 'Application' for 'Profile Type' to better match phlare's semantics
  • Loading branch information
eh-am authored Apr 17, 2023
2 parents 224e15b + 2472dfd commit 3ccfa10
Show file tree
Hide file tree
Showing 5 changed files with 16 additions and 3 deletions.
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
5 changes: 5 additions & 0 deletions public/app/overrides/components/AppSelector/Label.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
export function Label() {
return <>Profile Type:&nbsp;</>;
}

export const LabelString = 'Select Profile Type';
5 changes: 5 additions & 0 deletions scripts/webpack/webpack.common.js
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down
3 changes: 3 additions & 0 deletions tsconfig.json
Original file line number Diff line number Diff line change
Expand Up @@ -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/*"],
Expand All @@ -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"],
Expand Down
4 changes: 2 additions & 2 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down

0 comments on commit 3ccfa10

Please sign in to comment.