fix: filter redesign (#528)

* fix: upgraded to Analytics v3.0.1 for the latest filter updates * chore: snapshot updates
dhis2 · Jan 31, 2020 · 852459c · 852459c
1 parent 3647034
commit 852459c
Show file tree

Hide file tree

Showing 6 changed files with 239 additions and 27 deletions.
diff --git a/package.json b/package.json
@@ -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",
@@ -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",

diff --git a/src/components/ControlBar/__tests__/__snapshots__/ConfirmDeleteDialog.spec.js.snap b/src/components/ControlBar/__tests__/__snapshots__/ConfirmDeleteDialog.spec.js.snap
@@ -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"
@@ -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"
@@ -144,6 +148,7 @@ ShallowWrapper {
             "nodeType": "class",
             "props": Object {
               "children": "Cancel",
+              "dataTest": "dhis2-uicore-button",
               "onClick": [MockFunction],
               "secondary": true,
               "type": "button",
@@ -158,6 +163,7 @@ ShallowWrapper {
             "nodeType": "class",
             "props": Object {
               "children": "Delete",
+              "dataTest": "dhis2-uicore-button",
               "destructive": true,
               "onClick": [MockFunction],
               "type": "button",
@@ -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"
@@ -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"
@@ -299,6 +309,7 @@ ShallowWrapper {
               "nodeType": "class",
               "props": Object {
                 "children": "Cancel",
+                "dataTest": "dhis2-uicore-button",
                 "onClick": [MockFunction],
                 "secondary": true,
                 "type": "button",
@@ -313,6 +324,7 @@ ShallowWrapper {
               "nodeType": "class",
               "props": Object {
                 "children": "Delete",
+                "dataTest": "dhis2-uicore-button",
                 "destructive": true,
                 "onClick": [MockFunction],
                 "type": "button",