@vizzly/dashboard 0.15.0-dev-7c9658e993e6c1d321c4d69f2e166bbb37cca3aa → 0.15.0-dev-fc9a212537551949051fa3edc71c9f0f8be72497

package/dist/dashboard.esm.js

@@ -40355,7 +40355,7 @@ var FiltersModal = function FiltersModal(_ref) {
     show = _ref.show,
     _onClose = _ref.onClose,
     source = _ref.source,
-    onDeleteItem = _ref.onDeleteItem,
+    _onDeleteItem = _ref.onDeleteItem,
     onUpdate = _ref.onUpdate;
   var dataSets = allDataSets.filter(function (dS) {
     return !dS.preAggregated;
@@ -40419,7 +40419,8 @@ var FiltersModal = function FiltersModal(_ref) {
           filterIndex: filterIndex
         });
       } : function () {},
-      id: "filter_" + filterIndex
+      id: "filter_" + filterIndex,
+      context: _extends({}, filter)
     });
   }).filter(function (item) {
     return !item.isHiddenFilter;
@@ -40438,7 +40439,18 @@ var FiltersModal = function FiltersModal(_ref) {
       }), jsx(Modal.Content, {
         children: jsx(ListView, {
           mode: mode,
-          onDeleteItem: onDeleteItem,
+          onDeleteItem: function onDeleteItem(_index, filterToRemove) {
+            var newFilters = [].concat(filters);
+            var index = newFilters.findIndex(function (f) {
+              return JSON.stringify(f) === JSON.stringify(filterToRemove);
+            });
+            if (index >= -1) {
+              newFilters.splice(index, 1);
+              _onDeleteItem(newFilters);
+            } else {
+              logDebug('Failed to find filter to remove', filters, filterToRemove);
+            }
+          },
           newItemBtn: {
             callToAction: source === 'global' ? textOverride('new_dashboard_filter', 'New dashboard filter') : textOverride('new_local_filter', 'New local filter'),
             onClick: function onClick() {
@@ -40523,10 +40535,8 @@ var ManageGlobalFiltersButton = function ManageGlobalFiltersButton() {
     var combineFilters = updateFilters(dashboard.globalFilters, payload);
     setGlobalFilters(combineFilters);
   };
-  var removeFilter = function removeFilter(index) {
-    var newGlobalFilters = [].concat(dashboard.globalFilters);
-    newGlobalFilters.splice(index, 1);
-    setGlobalFilters(newGlobalFilters);
+  var onFilterRemoved = function onFilterRemoved(remainingFilters) {
+    setGlobalFilters(remainingFilters);
   };
   return jsxs(Fragment$1, {
     children: [jsx(FilterButton, {
@@ -40541,7 +40551,7 @@ var ManageGlobalFiltersButton = function ManageGlobalFiltersButton() {
       show: isManageGlobalFiltersOpen,
       onUpdate: handleUpdateFilters,
       source: "global",
-      onDeleteItem: removeFilter,
+      onDeleteItem: onFilterRemoved,
       onClose: function onClose() {
         trackEvent('manageGlobalFilters.close');
         setManageGlobalFiltersOpen(false);
@@ -58438,10 +58448,8 @@ var LocalFiltersModal = function LocalFiltersModal(props) {
     var combineFilters = updateFilters(localFilters, payload);
     props == null || props.setLocalFilters(combineFilters);
   };
-  var removeFilter = function removeFilter(index) {
-    var newFilters = [].concat(localFilters);
-    newFilters.splice(index, 1);
-    props == null || props.setLocalFilters(newFilters);
+  var onFilterRemoved = function onFilterRemoved(remainingFilters) {
+    props.setLocalFilters(remainingFilters);
   };
   return jsx(FiltersModal, {
     dataSets: [dataSet],
@@ -58449,7 +58457,7 @@ var LocalFiltersModal = function LocalFiltersModal(props) {
     show: props == null ? void 0 : props.show,
     onUpdate: handleUpdateFilters,
     source: "local",
-    onDeleteItem: removeFilter,
+    onDeleteItem: onFilterRemoved,
     onClose: function onClose() {
       return props == null ? void 0 : props.onClose();
     }

package/dist/shared-logic/src/AdditionalFilter/FilterConfig.d.ts

@@ -1,9 +1,7 @@
 import { DataSet } from '../DataSet/types';
 import { Query } from '../Query/types';
-import { QueryAttributes } from '../QueryAttributes/types';
 import { VariableList } from '../Variables/types';
 import { AdditionalFilter, FilterConfig, TimeRangeOptions } from './types';
-export declare const fromFilterConfig: (filterConfig: FilterConfig, dataSet: DataSet, timeRangeOptions: TimeRangeOptions) => QueryAttributes.Filter[][];
 export declare const processAdditionalFilter: (filter: AdditionalFilter, dataSet: DataSet, timeRangeOptions: TimeRangeOptions, variables: VariableList) => Query['filter'];
 /**
  * Combines different types of filters (global, local, and view filters) into a single Query filter structure.

package/dist/shared-logic/src/Filter/Filter.d.ts

@@ -5,7 +5,6 @@ import { QueryAttributes } from '../QueryAttributes/types';
 import { QueryEngineConfig } from '../QueryEngineConfig/types';
 import { VariableList } from '../Variables/types';
 export declare const addAndFilters: (filter: QueryAttributes['filter'], filterToAddToAll: QueryAttributes.Filter[][]) => QueryAttributes['filter'];
-export declare const filterAttributeToQueryFilter: (filterAttrs: QueryAttributes.Filter[][], queryEngineConfig: QueryEngineConfig, dataSet: DataSet, params: Params) => Query['filter'];
 export declare const convertArrayFilterStructureToQueryFilter: (arrayFilterStructure: QueryAttributes.Filter[][], variables: VariableList) => Query['filter'];
 export declare const combineQueryFilters: (filter: Query['filter'], filterToAddToAll: Query['filter']) => Query['filter'];
 /**

package/dist/shared-ui/src/components/AdditionalFilter/FiltersModal.d.ts

@@ -11,7 +11,7 @@ export declare const FiltersModal: FunctionComponent<{
     show: boolean;
     onClose: () => void;
     source: 'local' | 'global';
-    onDeleteItem: (index: number) => void;
+    onDeleteItem: (remainingFilters: AdditionalFilter[]) => void;
     onUpdate: (payload: FilterInputPayload) => void;
 }>;
 export declare function updateFilters(filters: AdditionalFilter[], payload: FilterInputPayload): AdditionalFilter[];

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@vizzly/dashboard",
   "author": "james@vizzly.co",
-  "version": "0.15.0-dev-7c9658e993e6c1d321c4d69f2e166bbb37cca3aa",
+  "version": "0.15.0-dev-fc9a212537551949051fa3edc71c9f0f8be72497",
   "source": "src/index.tsx",
   "types": "./dist/dashboard/src/index.d.ts",
   "module": "./dist/dashboard.esm.js",