Support displaying filters without parameters

metasfresh · Dec 13, 2017 · e1bffed · e1bffed · teosarca · Dec 13, 2017
1 parent a07afb5
commit e1bffed
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 5 deletions.
diff --git a/src/components/filters/Filters.js b/src/components/filters/Filters.js
@@ -121,10 +121,12 @@ class Filters extends Component {
     const { filter } = this.state;
 
     return unannotatedFilters.map(unannotatedFilter => {
-      const parameter = unannotatedFilter.parameters[0];
-      const filterType = parameter.widgetType;
+      const parameter =
+        unannotatedFilter.parameters && unannotatedFilter.parameters[0];
+      const filterType = parameter && parameter.widgetType;
       const isActive = this.isFilterActive(unannotatedFilter.filterId);
-      const activeParameter = isActive && filter[0] && filter[0].parameters[0];
+      const activeParameter =
+        parameter && isActive && filter[0] && filter[0].parameters[0];
       const captionValue = activeParameter
         ? TableCell.fieldValueToString(
             activeParameter.valueTo

diff --git a/src/components/filters/FiltersFrequent.js b/src/components/filters/FiltersFrequent.js
@@ -75,7 +75,10 @@ class FiltersFrequent extends Component {
                 })}
               >
                 <i className="meta-icon-preview" />
-                {item.isActive && item.parameters.length === 1 ? (
+                {item.isActive &&
+                item.parameters &&
+                item.parameters.length === 1 &&
+                item.captionValue ? (
                   <Fragment>
                     {`${item.caption}: `}
                     {item.captionValue}

diff --git a/src/components/filters/FiltersNotFrequent.js b/src/components/filters/FiltersNotFrequent.js
@@ -73,7 +73,9 @@ class FiltersNotFrequent extends Component {
         >
           <i className="meta-icon-preview" />
           {activeFilter ? (
-            activeFilter.parameters.length === 1 ? (
+            activeFilter.parameters &&
+            activeFilter.parameters.length === 1 &&
+            activeFilter.captionValue ? (
               <Fragment>
                 {`${activeFilter.caption}: `}
                 {activeFilter.captionValue}