feat(toolbar): issues/10 add usage filter (#361)

* i18n, locale strings for usage * toolbar, toolbarTypes, add usage filter * redux, middleware, multiActionMiddleware, add array of actions * redux, reducers, types, toolbar addtions * styles, add toolbar styles
RedHatInsights · Aug 4, 2020 · 0004847 · 0004847
1 parent 916312c
commit 0004847
Show file tree

Hide file tree

Showing 22 changed files with 1,268 additions and 180 deletions.
diff --git a/public/locales/en-US.json b/public/locales/en-US.json
@@ -49,12 +49,20 @@
     "tableSkeletonAriaLabel": "Loading"
   },
   "curiosity-toolbar": {
+    "category": "Filter by",
+    "categoryPlaceholder": "Filter by",
     "slaCategory": "SLA",
     "slaNone": "No SLA",
     "slaPlaceholder": "Filter by SLA",
     "slaPremium": "Premium",
     "slaSelfSupport": "Self-Support",
-    "slaStandard": "Standard"
+    "slaStandard": "Standard",
+    "usageCategory": "Usage",
+    "usagePlaceholder": "Filter by usage",
+    "usageDevelopment": "Development/Test",
+    "usageDisaster": "Disaster Recovery",
+    "usageProduction": "Production",
+    "usageUnspecified": "Unspecified"
   },
   "curiosity-optin": {
     "buttonActivate": "Activate {{appName}}",

diff --git a/src/components/i18n/__tests__/__snapshots__/i18n.test.js.snap b/src/components/i18n/__tests__/__snapshots__/i18n.test.js.snap
@@ -330,6 +330,14 @@ Array [
   Object {
     "file": "./src/components/toolbar/toolbar.js",
     "keys": Array [
+      Object {
+        "key": "curiosity-toolbar.category",
+        "match": "t('curiosity-toolbar.category')",
+      },
+      Object {
+        "key": "curiosity-toolbar.categoryPlaceholder",
+        "match": "t('curiosity-toolbar.categoryPlaceholder')",
+      },
       Object {
         "key": "curiosity-toolbar.slaCategory",
         "match": "t('curiosity-toolbar.slaCategory')",
@@ -342,6 +350,18 @@ Array [
         "key": "curiosity-toolbar.slaPlaceholder",
         "match": "t('curiosity-toolbar.slaPlaceholder')",
       },
+      Object {
+        "key": "curiosity-toolbar.usageCategory",
+        "match": "t('curiosity-toolbar.usageCategory')",
+      },
+      Object {
+        "key": "curiosity-toolbar.usageCategory",
+        "match": "t('curiosity-toolbar.usageCategory')",
+      },
+      Object {
+        "key": "curiosity-toolbar.usagePlaceholder",
+        "match": "t('curiosity-toolbar.usagePlaceholder')",
+      },
     ],
   },
   Object {
@@ -363,6 +383,30 @@ Array [
         "key": "curiosity-toolbar.slaNone",
         "match": "translate('curiosity-toolbar.slaNone')",
       },
+      Object {
+        "key": "curiosity-toolbar.usageDevelopment",
+        "match": "translate('curiosity-toolbar.usageDevelopment')",
+      },
+      Object {
+        "key": "curiosity-toolbar.usageDisaster",
+        "match": "translate('curiosity-toolbar.usageDisaster')",
+      },
+      Object {
+        "key": "curiosity-toolbar.usageProduction",
+        "match": "translate('curiosity-toolbar.usageProduction')",
+      },
+      Object {
+        "key": "curiosity-toolbar.usageUnspecified",
+        "match": "translate('curiosity-toolbar.usageUnspecified')",
+      },
+      Object {
+        "key": "curiosity-toolbar.slaCategory",
+        "match": "translate('curiosity-toolbar.slaCategory')",
+      },
+      Object {
+        "key": "curiosity-toolbar.usageCategory",
+        "match": "translate('curiosity-toolbar.usageCategory')",
+      },
     ],
   },
   Object {

diff --git a/src/components/openshiftView/__tests__/__snapshots__/openshiftView.test.js.snap b/src/components/openshiftView/__tests__/__snapshots__/openshiftView.test.js.snap
@@ -9,14 +9,12 @@ exports[`OpenshiftView Component should display an alternate graph on query-stri
     t(curiosity-view.OpenShiftTitle, Subscription Watch)
   </PageHeader>
   <PageToolbar>
-    <Toolbar
-      isDisabled={false}
+    <Connect(Toolbar)
       query={
         Object {
           "granularity": "daily",
         }
       }
-      t={[Function]}
       viewId="OpenShift"
     />
   </PageToolbar>
@@ -85,14 +83,12 @@ exports[`OpenshiftView Component should have a fallback title: title 1`] = `
     t(curiosity-view.OpenShiftTitle, Subscription Watch)
   </PageHeader>
   <PageToolbar>
-    <Toolbar
-      isDisabled={false}
+    <Connect(Toolbar)
       query={
         Object {
           "granularity": "daily",
         }
       }
-      t={[Function]}
       viewId="OpenShift"
     />
   </PageToolbar>
@@ -161,14 +157,12 @@ exports[`OpenshiftView Component should render a non-connected component: non-co
     t(curiosity-view.OpenShiftTitle, Subscription Watch)
   </PageHeader>
   <PageToolbar>
-    <Toolbar
-      isDisabled={false}
+    <Connect(Toolbar)
       query={
         Object {
           "granularity": "daily",
         }
       }
-      t={[Function]}
       viewId="OpenShift"
     />
   </PageToolbar>

diff --git a/src/components/rhelView/__tests__/__snapshots__/rhelView.test.js.snap b/src/components/rhelView/__tests__/__snapshots__/rhelView.test.js.snap
@@ -9,14 +9,12 @@ exports[`RhelView Component should display an alternate graph on query-string up
     t(curiosity-view.RHELTitle, Subscription Watch)
   </PageHeader>
   <PageToolbar>
-    <Toolbar
-      isDisabled={false}
+    <Connect(Toolbar)
       query={
         Object {
           "granularity": "daily",
         }
       }
-      t={[Function]}
       viewId="RHEL"
     />
   </PageToolbar>
@@ -71,14 +69,12 @@ exports[`RhelView Component should have a fallback title: title 1`] = `
     t(curiosity-view.RHELTitle, Subscription Watch)
   </PageHeader>
   <PageToolbar>
-    <Toolbar
-      isDisabled={false}
+    <Connect(Toolbar)
       query={
         Object {
           "granularity": "daily",
         }
       }
-      t={[Function]}
       viewId="RHEL"
     />
   </PageToolbar>
@@ -133,14 +129,12 @@ exports[`RhelView Component should render a non-connected component: non-connect
     t(curiosity-view.RHELTitle, Subscription Watch)
   </PageHeader>
   <PageToolbar>
-    <Toolbar
-      isDisabled={false}
+    <Connect(Toolbar)
       query={
         Object {
           "granularity": "daily",
         }
       }
-      t={[Function]}
       viewId="RHEL"
     />
   </PageToolbar>