Skip to content
This repository has been archived by the owner on Nov 6, 2020. It is now read-only.

Commit

Permalink
fix: adjust resource action path in headerbar (#53)
Browse files Browse the repository at this point in the history
* chore: adjust resource path in headerbar story

* fix: update app-runtime to support action prefix

* chore: update peer dep
  • Loading branch information
Mohammer5 authored and varl committed Jul 9, 2019
1 parent ab2b858 commit 04fbdcd
Show file tree
Hide file tree
Showing 4 changed files with 9 additions and 9 deletions.
4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@
"@babel/plugin-transform-react-constant-elements": "^7.5.0",
"@babel/preset-env": "^7.5.2",
"@babel/preset-react": "^7.0.0",
"@dhis2/app-runtime": "1.2.0",
"@dhis2/app-runtime": "1.3.0",
"@dhis2/cli-style": "3.3.4",
"@dhis2/d2-i18n-extract": "1.0.8",
"@dhis2/d2-i18n-generate": "1.1.1",
Expand All @@ -59,7 +59,7 @@
"typeface-roboto": "^0.0.54"
},
"peerDependencies": {
"@dhis2/app-runtime": "^1.1.0",
"@dhis2/app-runtime": "^1.3",
"prop-types": "^15",
"react": "^16.8",
"react-dom": "^16.8"
Expand Down
2 changes: 1 addition & 1 deletion src/HeaderBar/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ export const HeaderBar = ({ appName, className }) => {
resource: 'me',
},
apps: {
resource: '../dhis-web-commons/menu/getModules.action',
resource: 'action::menu/getModules',
},
notifications: {
resource: 'me/dashboard',
Expand Down
2 changes: 1 addition & 1 deletion stories/HeaderBar.stories.js
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ const customData = {
keyUiLocale: 'en',
},
},
'../../dhis-web-commons/menu/getModules.action': {
'action::menu/getModules': {
modules: [
{
name: 'dhis-web-dashboard',
Expand Down
10 changes: 5 additions & 5 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -369,7 +369,7 @@
"@babel/helper-plugin-utils" "^7.0.0"
"@babel/plugin-syntax-object-rest-spread" "^7.2.0"

"@babel/plugin-proposal-object-rest-spread@^7.3.2", "@babel/plugin-proposal-object-rest-spread@^7.4.3", "@babel/plugin-proposal-object-rest-spread@^7.5.0", "@babel/plugin-proposal-object-rest-spread@^7.5.2":
"@babel/plugin-proposal-object-rest-spread@^7.3.2", "@babel/plugin-proposal-object-rest-spread@^7.4.3", "@babel/plugin-proposal-object-rest-spread@^7.5.2":
version "7.5.2"
resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.5.2.tgz#ec92b0c6419074ea7af77c78b7c5d42041f2f5a9"
integrity sha512-C/JU3YOx5J4d9s0GGlJlYXVwsbd5JmqQ0AvB7cIDAx7nN57aDTnlJEsZJPuSskeBtMGFWSWU5Q+piTiDe0s7FQ==
Expand Down Expand Up @@ -1117,10 +1117,10 @@
dependencies:
find-up "^2.1.0"

"@dhis2/app-runtime@1.2.0":
version "1.2.0"
resolved "https://registry.yarnpkg.com/@dhis2/app-runtime/-/app-runtime-1.2.0.tgz#87e22d817a13d45a7d89d854e6152cfd959ec55d"
integrity sha512-2JOKPYIdNVpb6vVwuqmO+1ERelUdOYqFgWJDD2xnMNWYhNOPxvqi8v5rPLaOfTsUWeQ0RgBukPfRRJbBSqkipw==
"@dhis2/app-runtime@1.3.0":
version "1.3.0"
resolved "https://registry.yarnpkg.com/@dhis2/app-runtime/-/app-runtime-1.3.0.tgz#7f2e37ceb8b4df8642b18128aaa153b852400ba1"
integrity sha512-QF/B4aJpPmDk/roNrRg/nETJ07BcuD1uV/lVGa4BnnvYwOz1P+PxSYA/qdTXzgpcUK1rc6nMsuORGTCVNvWrVQ==

"@dhis2/[email protected]":
version "1.3.0"
Expand Down

0 comments on commit 04fbdcd

Please sign in to comment.