Skip to content

Commit

Permalink
fix: filter redesign (#528)
Browse files Browse the repository at this point in the history
* fix: upgraded to Analytics v3.0.1 for the latest filter updates

* chore: snapshot updates
  • Loading branch information
martinkrulltott authored Jan 31, 2020
1 parent 3647034 commit 852459c
Show file tree
Hide file tree
Showing 6 changed files with 239 additions and 27 deletions.
4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
"private": true,
"license": "BSD-3-Clause",
"dependencies": {
"@dhis2/analytics": "^2.8.3",
"@dhis2/analytics": "^3.0.1",
"@dhis2/app-runtime": "^2.0.3",
"@dhis2/d2-i18n": "^1.0.6",
"@dhis2/d2-ui-core": "^6.0.1",
Expand All @@ -16,7 +16,7 @@
"@dhis2/d2-ui-translation-dialog": "^6.0.1",
"@dhis2/data-visualizer-plugin": "^33.1.6",
"@dhis2/prop-types": "^1.2.1",
"@dhis2/ui-core": "^4.0.3",
"@dhis2/ui-core": "^4.7.1",
"@dhis2/ui-widgets": "^2.0.5",
"@material-ui/core": "^3.9.2",
"@material-ui/icons": "^3.0.2",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -47,13 +47,15 @@ ShallowWrapper {
</WithStyles(DialogContent)>,
<WithStyles(DialogActions)>
<Button
dataTest="dhis2-uicore-button"
onClick={[MockFunction]}
secondary={true}
type="button"
>
Cancel
</Button>
<Button
dataTest="dhis2-uicore-button"
destructive={true}
onClick={[MockFunction]}
type="button"
Expand Down Expand Up @@ -121,13 +123,15 @@ ShallowWrapper {
"props": Object {
"children": Array [
<Button
dataTest="dhis2-uicore-button"
onClick={[MockFunction]}
secondary={true}
type="button"
>
Cancel
</Button>,
<Button
dataTest="dhis2-uicore-button"
destructive={true}
onClick={[MockFunction]}
type="button"
Expand All @@ -144,6 +148,7 @@ ShallowWrapper {
"nodeType": "class",
"props": Object {
"children": "Cancel",
"dataTest": "dhis2-uicore-button",
"onClick": [MockFunction],
"secondary": true,
"type": "button",
Expand All @@ -158,6 +163,7 @@ ShallowWrapper {
"nodeType": "class",
"props": Object {
"children": "Delete",
"dataTest": "dhis2-uicore-button",
"destructive": true,
"onClick": [MockFunction],
"type": "button",
Expand Down Expand Up @@ -202,13 +208,15 @@ ShallowWrapper {
</WithStyles(DialogContent)>,
<WithStyles(DialogActions)>
<Button
dataTest="dhis2-uicore-button"
onClick={[MockFunction]}
secondary={true}
type="button"
>
Cancel
</Button>
<Button
dataTest="dhis2-uicore-button"
destructive={true}
onClick={[MockFunction]}
type="button"
Expand Down Expand Up @@ -276,13 +284,15 @@ ShallowWrapper {
"props": Object {
"children": Array [
<Button
dataTest="dhis2-uicore-button"
onClick={[MockFunction]}
secondary={true}
type="button"
>
Cancel
</Button>,
<Button
dataTest="dhis2-uicore-button"
destructive={true}
onClick={[MockFunction]}
type="button"
Expand All @@ -299,6 +309,7 @@ ShallowWrapper {
"nodeType": "class",
"props": Object {
"children": "Cancel",
"dataTest": "dhis2-uicore-button",
"onClick": [MockFunction],
"secondary": true,
"type": "button",
Expand All @@ -313,6 +324,7 @@ ShallowWrapper {
"nodeType": "class",
"props": Object {
"children": "Delete",
"dataTest": "dhis2-uicore-button",
"destructive": true,
"onClick": [MockFunction],
"type": "button",
Expand Down
Loading

0 comments on commit 852459c

Please sign in to comment.