@multiplatform.one/backoffice 6.7.0 → 7.0.0

package/dist/cjs/report/QueryReportScreen.cjs

@@ -26,91 +26,19 @@ __export(QueryReportScreen_exports, {
 });
 module.exports = __toCommonJS(QueryReportScreen_exports);
 var import_components = require("@multiplatform.one/components");
-var import_forms = require("@multiplatform.one/forms");
 var import_table = require("@multiplatform.one/table");
-var import_react = require("react");
+var import_platform = require("@multiplatform.one/platform");
+var import_react = require("@phosphor-icons/react");
+var import_react2 = require("react");
 var import_react_i18next = require("react-i18next");
 var import_BackofficeProvider = require("../config/BackofficeProvider.cjs");
 var import_i18n = require("../i18n/index.cjs");
-var import_filter_fields = require("../list/filter-fields.cjs");
 var import_queryReportColumns = require("./queryReportColumns.cjs");
+var import_queryReportFilterBar = require("./queryReportFilterBar.cjs");
+var import_queryReportUrlState = require("./queryReportUrlState.cjs");
 var import_useQueryReport = require("./useQueryReport.cjs");
 var import_jsx_runtime = require("react/jsx-runtime");
 const PAGE_SIZES = [20, 100, 500];
-function draftFromFilters(filterMeta, filters) {
-  const draft = {};
-  for (const filter of filterMeta) {
-    const value = filters[filter.fieldname] ?? filter.default;
-    draft[filter.fieldname] = value === void 0 || value === null ? "" : String(value);
-  }
-  return draft;
-}
-function ReportFilterBar({
-  filterMeta,
-  filters,
-  onApply
-}) {
-  const {
-    t
-  } = (0, import_react_i18next.useTranslation)(import_i18n.BACKOFFICE_I18N_NAMESPACE);
-  const [draft, setDraft] = (0, import_react.useState)(() => draftFromFilters(filterMeta, filters));
-  (0, import_react.useEffect)(() => {
-    setDraft(draftFromFilters(filterMeta, filters));
-  }, [filterMeta, filters]);
-  const apply = (0, import_react.useCallback)(() => {
-    const next = {};
-    for (const [fieldname, value] of Object.entries(draft)) {
-      if (value !== "") next[fieldname] = value;
-    }
-    onApply(next);
-  }, [draft, onApply]);
-  return /* @__PURE__ */(0, import_jsx_runtime.jsxs)(import_components.XStack, {
-    gap: "$2",
-    flexWrap: "wrap",
-    alignItems: "flex-end",
-    children: [filterMeta.map(filter => {
-      const label = filter.label || filter.fieldname;
-      const requiredMark = filter.mandatory === 1 ? " *" : "";
-      return /* @__PURE__ */(0, import_jsx_runtime.jsxs)(import_components.YStack, {
-        gap: "$1",
-        minWidth: 180,
-        children: [/* @__PURE__ */(0, import_jsx_runtime.jsxs)(import_components.Text, {
-          fontSize: "$2",
-          color: "$color10",
-          children: [label, requiredMark]
-        }), filter.fieldtype === "Select" && filter.options ? /* @__PURE__ */(0, import_jsx_runtime.jsx)(import_forms.Select, {
-          value: draft[filter.fieldname] ?? "",
-          onChange: next => {
-            if (typeof next === "string") setDraft(previous => ({
-              ...previous,
-              [filter.fieldname]: next
-            }));
-          },
-          options: (0, import_filter_fields.selectOptionsFromField)(filter.options),
-          placeholder: t("queryReport.selectValue", "Select..."),
-          size: "$3",
-          compact: true,
-          "aria-label": label
-        }) : /* @__PURE__ */(0, import_jsx_runtime.jsx)(import_forms.Input, {
-          value: draft[filter.fieldname] ?? "",
-          onChangeText: next => setDraft(previous => ({
-            ...previous,
-            [filter.fieldname]: next
-          })),
-          placeholder: filter.fieldtype === "Date" ? "YYYY-MM-DD" : void 0,
-          size: "$3",
-          compact: true,
-          "aria-label": label
-        })]
-      }, filter.fieldname);
-    }), /* @__PURE__ */(0, import_jsx_runtime.jsx)(import_components.Button, {
-      size: "$3",
-      theme: "blue",
-      onPress: apply,
-      children: t("queryReport.apply", "Apply")
-    })]
-  });
-}
 function QueryReportScreen({
   reportName,
   fixture,
@@ -123,18 +51,58 @@ function QueryReportScreen({
   } = (0, import_react_i18next.useTranslation)(import_i18n.BACKOFFICE_I18N_NAMESPACE);
   const navigator = (0, import_BackofficeProvider.useBackofficeNavigator)();
   const paths = (0, import_BackofficeProvider.useBackofficePaths)();
+  const {
+    params
+  } = (0, import_BackofficeProvider.useBackofficeLocation)();
+  const rawFiltersParam = typeof params.filters === "string" ? params.filters : Array.isArray(params.filters) ? params.filters[0] : void 0;
+  const initialFilterValues = (0, import_react2.useMemo)(() => {
+    const fromParam = (0, import_queryReportUrlState.parseQueryReportFiltersParam)(rawFiltersParam);
+    if (Object.keys(fromParam).length > 0) return fromParam;
+    return initialFilters;
+  }, [rawFiltersParam, initialFilters]);
   const report = (0, import_useQueryReport.useQueryReport)(reportName, {
     fixture,
-    initialFilters
+    initialFilters: initialFilterValues
   });
-  const handleOpenLink = (0, import_react.useCallback)((doctype, name) => {
+  const {
+    setFilters
+  } = report;
+  const applyFilters = (0, import_react2.useCallback)(next => {
+    setFilters(next);
+    navigator.setParams?.({
+      filters: (0, import_queryReportUrlState.serializeQueryReportFiltersParam)(next)
+    });
+  }, [setFilters, navigator]);
+  const filtersRef = (0, import_react2.useRef)(report.filters);
+  filtersRef.current = report.filters;
+  const filterMetaRef = (0, import_react2.useRef)(report.filterMeta);
+  filterMetaRef.current = report.filterMeta;
+  const lastAdopted = (0, import_react2.useRef)({
+    report: reportName,
+    param: rawFiltersParam
+  });
+  (0, import_react2.useEffect)(() => {
+    const last = lastAdopted.current;
+    const reportChanged = last.report !== reportName;
+    const paramChanged = last.param !== rawFiltersParam;
+    lastAdopted.current = {
+      report: reportName,
+      param: rawFiltersParam
+    };
+    if (reportChanged || !paramChanged) return;
+    const parsed = (0, import_queryReportUrlState.parseQueryReportFiltersParam)(rawFiltersParam);
+    const next = Object.keys(parsed).length > 0 ? parsed : (0, import_useQueryReport.defaultFilterValues)(filterMetaRef.current);
+    if ((0, import_queryReportUrlState.serializeQueryReportFiltersParam)(next) === (0, import_queryReportUrlState.serializeQueryReportFiltersParam)(filtersRef.current)) return;
+    setFilters(next);
+  }, [reportName, rawFiltersParam, setFilters]);
+  const handleOpenLink = (0, import_react2.useCallback)((doctype, name) => {
     if (onRowOpen) {
       onRowOpen(doctype, name);
       return;
     }
     navigator.navigate(paths.form(doctype, name));
   }, [navigator, paths, onRowOpen]);
-  const tableColumns = (0, import_react.useMemo)(() => {
+  const tableColumns = (0, import_react2.useMemo)(() => {
     const hidden = new Set(hiddenColumns ?? []);
     const visible = hidden.size ? report.columns.filter(column => !hidden.has(column.fieldname)) : report.columns;
     return (0, import_queryReportColumns.buildQueryReportColumns)({
@@ -143,7 +111,23 @@ function QueryReportScreen({
     });
   }, [report.columns, handleOpenLink, hiddenColumns]);
   const title = report.meta?.report_name || reportName;
-  const subtitle = (0, import_react.useMemo)(() => {
+  const hasVisibleFilters = report.filterMeta.some(filter => filter.hidden !== 1 && !(0, import_useQueryReport.isEmptyFilterValue)(report.filters[filter.fieldname]));
+  const clearVisibleFilters = (0, import_react2.useCallback)(() => {
+    const next = {};
+    for (const filter of report.filterMeta) {
+      if (filter.hidden === 1 && !(0, import_useQueryReport.isEmptyFilterValue)(report.filters[filter.fieldname])) {
+        next[filter.fieldname] = report.filters[filter.fieldname];
+      }
+    }
+    applyFilters(next);
+  }, [report.filterMeta, report.filters, applyFilters]);
+  const handleExport = (0, import_react2.useCallback)(() => {
+    if (!import_components.isWeb || report.rows.length === 0) return;
+    (0, import_platform.downloadBlob)(new Blob([(0, import_queryReportColumns.buildQueryReportCsv)(report.columns, report.rows)], {
+      type: "text/csv;charset=utf-8;"
+    }), `${(0, import_useQueryReport.scrubFieldname)(title)}.csv`);
+  }, [report.columns, report.rows, title]);
+  const subtitle = (0, import_react2.useMemo)(() => {
     if (report.loading) return void 0;
     const bits = [];
     if (report.meta?.ref_doctype) bits.push(report.meta.ref_doctype);
@@ -190,31 +174,35 @@ function QueryReportScreen({
         }),
         description: report.error.message,
         action: /* @__PURE__ */(0, import_jsx_runtime.jsx)(import_components.Button, {
-          theme: "blue",
+          theme: "accent",
           onPress: report.reload,
           children: t("queryReport.retry", "Retry")
         })
-      }), /* @__PURE__ */(0, import_jsx_runtime.jsx)(import_components.Text, {
+      }), report.scriptFilterGap ? /* @__PURE__ */(0, import_jsx_runtime.jsx)(import_components.Text, {
         fontSize: "$2",
         color: "$color9",
         textAlign: "center",
         paddingHorizontal: "$4",
-        children: t("queryReport.scriptFiltersHint", "Some reports require filters that are declared in desk-side scripts and cannot be derived here yet")
-      })]
+        children: t("queryReport.scriptFiltersHint", "Some of this report's filters are declared in desk-side scripts and could not be derived here")
+      }) : null]
     });
   } else if (report.missingRequired.length > 0) {
     body = /* @__PURE__ */(0, import_jsx_runtime.jsx)(import_components.EmptyState, {
       title: t("queryReport.filtersRequiredTitle", "Filters required"),
       description: t("queryReport.filtersRequiredDescription", {
         defaultValue: "Set the required filter(s) to run this report: {{filters}}",
-        filters: report.missingRequired.map(filter => filter.label || filter.fieldname).join(", ")
+        filters: report.missingRequired.map(filter => (0, import_queryReportFilterBar.queryReportFilterLabel)(filter)).join(", ")
       })
     });
   } else if (report.rows.length === 0) {
     body = /* @__PURE__ */(0, import_jsx_runtime.jsx)(import_components.EmptyState, {
       title: t("queryReport.emptyTitle", "No results"),
-      description: t("queryReport.emptyDescription", "The report ran but returned no rows"),
-      action: /* @__PURE__ */(0, import_jsx_runtime.jsx)(import_components.Button, {
+      description: hasVisibleFilters ? t("queryReport.emptyFiltered", "No rows match the current filters") : t("queryReport.emptyDescription", "The report ran but returned no rows"),
+      action: hasVisibleFilters ? /* @__PURE__ */(0, import_jsx_runtime.jsx)(import_components.Button, {
+        chromeless: true,
+        onPress: clearVisibleFilters,
+        children: t("queryReport.clearAllFilters", "Clear all filters")
+      }) : /* @__PURE__ */(0, import_jsx_runtime.jsx)(import_components.Button, {
         chromeless: true,
         onPress: report.reload,
         children: t("queryReport.refresh", "Refresh")
@@ -226,6 +214,7 @@ function QueryReportScreen({
       columns: tableColumns,
       enableSorting: true,
       enableFiltering: false,
+      enableGlobalSearch: false,
       enablePagination: true,
       initialState: {
         pagination: {
@@ -258,20 +247,40 @@ function QueryReportScreen({
           onPress: report.reload,
           disabled: report.loading,
           children: t("queryReport.refresh", "Refresh")
+        }), /* @__PURE__ */(0, import_jsx_runtime.jsx)(import_components.Button, {
+          size: "$2",
+          chromeless: true,
+          icon: import_react.DownloadSimpleIcon,
+          onPress: handleExport,
+          disabled: report.loading || report.rows.length === 0,
+          children: t("queryReport.exportCsv", "Export CSV")
         })]
       })
     }), report.serverMessage ? /* @__PURE__ */(0, import_jsx_runtime.jsx)(import_components.Text, {
       fontSize: "$2",
       color: "$color10",
       children: (0, import_useQueryReport.stripHtml)(report.serverMessage)
-    }) : null, report.filterMeta.length > 0 ? /* @__PURE__ */(0, import_jsx_runtime.jsx)(ReportFilterBar, {
-      filterMeta: report.filterMeta,
-      filters: report.filters,
-      onApply: report.setFilters
-    }) : null, /* @__PURE__ */(0, import_jsx_runtime.jsx)(import_components.YStack, {
+    }) : null, /* @__PURE__ */(0, import_jsx_runtime.jsxs)(import_components.YStack, {
       flex: 1,
       minWidth: 0,
-      children: body
+      borderWidth: 1,
+      borderColor: "$borderColor",
+      borderRadius: "$4",
+      children: [report.filterMeta.length > 0 ? /* @__PURE__ */(0, import_jsx_runtime.jsx)(import_queryReportFilterBar.QueryReportFilterBar, {
+        filterMeta: report.filterMeta,
+        filters: report.filters,
+        onApply: applyFilters
+      }) : null, !report.loading && report.scriptFilterGap && !report.error ? /* @__PURE__ */(0, import_jsx_runtime.jsx)(import_components.Text, {
+        fontSize: "$2",
+        color: "$color9",
+        paddingHorizontal: "$3",
+        paddingVertical: "$2",
+        children: t("queryReport.scriptFiltersGap", "Some of this report's filters are defined in code and aren't supported here yet")
+      }) : null, /* @__PURE__ */(0, import_jsx_runtime.jsx)(import_components.YStack, {
+        flex: 1,
+        minWidth: 0,
+        children: body
+      })]
     })]
   });
   return import_components.isWeb ? content : /* @__PURE__ */(0, import_jsx_runtime.jsx)(import_components.ScrollView, {

package/dist/cjs/report/QueryReportScreen.native.js

@@ -41,139 +41,18 @@ module.exports = __toCommonJS(QueryReportScreen_exports);
 var import_jsx_runtime = require("react/jsx-runtime");
 var import_react = __toESM(require("react"));
 var import_components = require("@multiplatform.one/components");
-var import_forms = require("@multiplatform.one/forms");
 var import_table = require("@multiplatform.one/table");
-var import_react2 = require("react");
+var import_platform = require("@multiplatform.one/platform");
+var import_react2 = require("@phosphor-icons/react");
+var import_react3 = require("react");
 var import_react_i18next = require("react-i18next");
 var import_BackofficeProvider = require("../config/BackofficeProvider.native.js");
 var import_i18n = require("../i18n/index.native.js");
-var import_filter_fields = require("../list/filter-fields.native.js");
 var import_queryReportColumns = require("./queryReportColumns.native.js");
+var import_queryReportFilterBar = require("./queryReportFilterBar.native.js");
+var import_queryReportUrlState = require("./queryReportUrlState.native.js");
 var import_useQueryReport = require("./useQueryReport.native.js");
 var PAGE_SIZES = [20, 100, 500];
-function draftFromFilters(filterMeta, filters) {
-  var draft = {};
-  var _iteratorNormalCompletion = true,
-    _didIteratorError = false,
-    _iteratorError = void 0;
-  try {
-    for (var _iterator = filterMeta[Symbol.iterator](), _step; !(_iteratorNormalCompletion = (_step = _iterator.next()).done); _iteratorNormalCompletion = true) {
-      var filter = _step.value;
-      var _filters_filter_fieldname;
-      var value = (_filters_filter_fieldname = filters[filter.fieldname]) !== null && _filters_filter_fieldname !== void 0 ? _filters_filter_fieldname : filter.default;
-      draft[filter.fieldname] = value === void 0 || value === null ? "" : String(value);
-    }
-  } catch (err) {
-    _didIteratorError = true;
-    _iteratorError = err;
-  } finally {
-    try {
-      if (!_iteratorNormalCompletion && _iterator.return != null) {
-        _iterator.return();
-      }
-    } finally {
-      if (_didIteratorError) {
-        throw _iteratorError;
-      }
-    }
-  }
-  return draft;
-}
-function ReportFilterBar(param) {
-  var {
-    filterMeta,
-    filters,
-    onApply
-  } = param;
-  var {
-    t
-  } = (0, import_react_i18next.useTranslation)(import_i18n.BACKOFFICE_I18N_NAMESPACE);
-  var [draft, setDraft] = (0, import_react2.useState)(function () {
-    return draftFromFilters(filterMeta, filters);
-  });
-  (0, import_react2.useEffect)(function () {
-    setDraft(draftFromFilters(filterMeta, filters));
-  }, [filterMeta, filters]);
-  var apply = (0, import_react2.useCallback)(function () {
-    var next = {};
-    var _iteratorNormalCompletion = true,
-      _didIteratorError = false,
-      _iteratorError = void 0;
-    try {
-      for (var _iterator = Object.entries(draft)[Symbol.iterator](), _step; !(_iteratorNormalCompletion = (_step = _iterator.next()).done); _iteratorNormalCompletion = true) {
-        var [fieldname, value] = _step.value;
-        if (value !== "") next[fieldname] = value;
-      }
-    } catch (err) {
-      _didIteratorError = true;
-      _iteratorError = err;
-    } finally {
-      try {
-        if (!_iteratorNormalCompletion && _iterator.return != null) {
-          _iterator.return();
-        }
-      } finally {
-        if (_didIteratorError) {
-          throw _iteratorError;
-        }
-      }
-    }
-    onApply(next);
-  }, [draft, onApply]);
-  return /* @__PURE__ */(0, import_jsx_runtime.jsxs)(import_components.XStack, {
-    gap: "$2",
-    flexWrap: "wrap",
-    alignItems: "flex-end",
-    children: [filterMeta.map(function (filter) {
-      var _draft_filter_fieldname, _draft_filter_fieldname1;
-      var label = filter.label || filter.fieldname;
-      var requiredMark = filter.mandatory === 1 ? " *" : "";
-      return /* @__PURE__ */(0, import_jsx_runtime.jsxs)(import_components.YStack, {
-        gap: "$1",
-        minWidth: 180,
-        children: [/* @__PURE__ */(0, import_jsx_runtime.jsxs)(import_components.Text, {
-          fontSize: "$2",
-          color: "$color10",
-          children: [label, requiredMark]
-        }), filter.fieldtype === "Select" && filter.options ? /* @__PURE__ */(0, import_jsx_runtime.jsx)(import_forms.Select, {
-          value: (_draft_filter_fieldname = draft[filter.fieldname]) !== null && _draft_filter_fieldname !== void 0 ? _draft_filter_fieldname : "",
-          onChange: function onChange(next) {
-            if (typeof next === "string") setDraft(function (previous) {
-              return {
-                ...previous,
-                [filter.fieldname]: next
-              };
-            });
-          },
-          options: (0, import_filter_fields.selectOptionsFromField)(filter.options),
-          placeholder: t("queryReport.selectValue", "Select..."),
-          size: "$3",
-          compact: true,
-          "aria-label": label
-        }) : /* @__PURE__ */(0, import_jsx_runtime.jsx)(import_forms.Input, {
-          value: (_draft_filter_fieldname1 = draft[filter.fieldname]) !== null && _draft_filter_fieldname1 !== void 0 ? _draft_filter_fieldname1 : "",
-          onChangeText: function onChangeText(next) {
-            return setDraft(function (previous) {
-              return {
-                ...previous,
-                [filter.fieldname]: next
-              };
-            });
-          },
-          placeholder: filter.fieldtype === "Date" ? "YYYY-MM-DD" : void 0,
-          size: "$3",
-          compact: true,
-          "aria-label": label
-        })]
-      }, filter.fieldname);
-    }), /* @__PURE__ */(0, import_jsx_runtime.jsx)(import_components.Button, {
-      size: "$3",
-      theme: "blue",
-      onPress: apply,
-      children: t("queryReport.apply", "Apply")
-    })]
-  });
-}
 function QueryReportScreen(param) {
   var {
     reportName,
@@ -188,18 +67,59 @@ function QueryReportScreen(param) {
   } = (0, import_react_i18next.useTranslation)(import_i18n.BACKOFFICE_I18N_NAMESPACE);
   var navigator = (0, import_BackofficeProvider.useBackofficeNavigator)();
   var paths = (0, import_BackofficeProvider.useBackofficePaths)();
+  var {
+    params
+  } = (0, import_BackofficeProvider.useBackofficeLocation)();
+  var rawFiltersParam = typeof params.filters === "string" ? params.filters : Array.isArray(params.filters) ? params.filters[0] : void 0;
+  var initialFilterValues = (0, import_react3.useMemo)(function () {
+    var fromParam = (0, import_queryReportUrlState.parseQueryReportFiltersParam)(rawFiltersParam);
+    if (Object.keys(fromParam).length > 0) return fromParam;
+    return initialFilters;
+  }, [rawFiltersParam, initialFilters]);
   var report = (0, import_useQueryReport.useQueryReport)(reportName, {
     fixture,
-    initialFilters
+    initialFilters: initialFilterValues
   });
-  var handleOpenLink = (0, import_react2.useCallback)(function (doctype, name) {
+  var {
+    setFilters
+  } = report;
+  var applyFilters = (0, import_react3.useCallback)(function (next) {
+    var _navigator_setParams;
+    setFilters(next);
+    (_navigator_setParams = navigator.setParams) === null || _navigator_setParams === void 0 ? void 0 : _navigator_setParams.call(navigator, {
+      filters: (0, import_queryReportUrlState.serializeQueryReportFiltersParam)(next)
+    });
+  }, [setFilters, navigator]);
+  var filtersRef = (0, import_react3.useRef)(report.filters);
+  filtersRef.current = report.filters;
+  var filterMetaRef = (0, import_react3.useRef)(report.filterMeta);
+  filterMetaRef.current = report.filterMeta;
+  var lastAdopted = (0, import_react3.useRef)({
+    report: reportName,
+    param: rawFiltersParam
+  });
+  (0, import_react3.useEffect)(function () {
+    var last = lastAdopted.current;
+    var reportChanged = last.report !== reportName;
+    var paramChanged = last.param !== rawFiltersParam;
+    lastAdopted.current = {
+      report: reportName,
+      param: rawFiltersParam
+    };
+    if (reportChanged || !paramChanged) return;
+    var parsed = (0, import_queryReportUrlState.parseQueryReportFiltersParam)(rawFiltersParam);
+    var next = Object.keys(parsed).length > 0 ? parsed : (0, import_useQueryReport.defaultFilterValues)(filterMetaRef.current);
+    if ((0, import_queryReportUrlState.serializeQueryReportFiltersParam)(next) === (0, import_queryReportUrlState.serializeQueryReportFiltersParam)(filtersRef.current)) return;
+    setFilters(next);
+  }, [reportName, rawFiltersParam, setFilters]);
+  var handleOpenLink = (0, import_react3.useCallback)(function (doctype, name) {
     if (onRowOpen) {
       onRowOpen(doctype, name);
       return;
     }
     navigator.navigate(paths.form(doctype, name));
   }, [navigator, paths, onRowOpen]);
-  var tableColumns = (0, import_react2.useMemo)(function () {
+  var tableColumns = (0, import_react3.useMemo)(function () {
     var hidden = new Set(hiddenColumns !== null && hiddenColumns !== void 0 ? hiddenColumns : []);
     var visible = hidden.size ? report.columns.filter(function (column) {
       return !hidden.has(column.fieldname);
@@ -210,7 +130,44 @@ function QueryReportScreen(param) {
     });
   }, [report.columns, handleOpenLink, hiddenColumns]);
   var title = ((_report_meta = report.meta) === null || _report_meta === void 0 ? void 0 : _report_meta.report_name) || reportName;
-  var subtitle = (0, import_react2.useMemo)(function () {
+  var hasVisibleFilters = report.filterMeta.some(function (filter) {
+    return filter.hidden !== 1 && !(0, import_useQueryReport.isEmptyFilterValue)(report.filters[filter.fieldname]);
+  });
+  var clearVisibleFilters = (0, import_react3.useCallback)(function () {
+    var next = {};
+    var _iteratorNormalCompletion = true,
+      _didIteratorError = false,
+      _iteratorError = void 0;
+    try {
+      for (var _iterator = report.filterMeta[Symbol.iterator](), _step; !(_iteratorNormalCompletion = (_step = _iterator.next()).done); _iteratorNormalCompletion = true) {
+        var filter = _step.value;
+        if (filter.hidden === 1 && !(0, import_useQueryReport.isEmptyFilterValue)(report.filters[filter.fieldname])) {
+          next[filter.fieldname] = report.filters[filter.fieldname];
+        }
+      }
+    } catch (err) {
+      _didIteratorError = true;
+      _iteratorError = err;
+    } finally {
+      try {
+        if (!_iteratorNormalCompletion && _iterator.return != null) {
+          _iterator.return();
+        }
+      } finally {
+        if (_didIteratorError) {
+          throw _iteratorError;
+        }
+      }
+    }
+    applyFilters(next);
+  }, [report.filterMeta, report.filters, applyFilters]);
+  var handleExport = (0, import_react3.useCallback)(function () {
+    if (!import_components.isWeb || report.rows.length === 0) return;
+    (0, import_platform.downloadBlob)(new Blob([(0, import_queryReportColumns.buildQueryReportCsv)(report.columns, report.rows)], {
+      type: "text/csv;charset=utf-8;"
+    }), `${(0, import_useQueryReport.scrubFieldname)(title)}.csv`);
+  }, [report.columns, report.rows, title]);
+  var subtitle = (0, import_react3.useMemo)(function () {
     var _report_meta2;
     if (report.loading) return void 0;
     var bits = [];
@@ -258,17 +215,17 @@ function QueryReportScreen(param) {
         }),
         description: report.error.message,
         action: /* @__PURE__ */(0, import_jsx_runtime.jsx)(import_components.Button, {
-          theme: "blue",
+          theme: "accent",
           onPress: report.reload,
           children: t("queryReport.retry", "Retry")
         })
-      }), /* @__PURE__ */(0, import_jsx_runtime.jsx)(import_components.Text, {
+      }), report.scriptFilterGap ? /* @__PURE__ */(0, import_jsx_runtime.jsx)(import_components.Text, {
         fontSize: "$2",
         color: "$color9",
         textAlign: "center",
         paddingHorizontal: "$4",
-        children: t("queryReport.scriptFiltersHint", "Some reports require filters that are declared in desk-side scripts and cannot be derived here yet")
-      })]
+        children: t("queryReport.scriptFiltersHint", "Some of this report's filters are declared in desk-side scripts and could not be derived here")
+      }) : null]
     });
   } else if (report.missingRequired.length > 0) {
     body = /* @__PURE__ */(0, import_jsx_runtime.jsx)(import_components.EmptyState, {
@@ -276,15 +233,19 @@ function QueryReportScreen(param) {
       description: t("queryReport.filtersRequiredDescription", {
         defaultValue: "Set the required filter(s) to run this report: {{filters}}",
         filters: report.missingRequired.map(function (filter) {
-          return filter.label || filter.fieldname;
+          return (0, import_queryReportFilterBar.queryReportFilterLabel)(filter);
         }).join(", ")
       })
     });
   } else if (report.rows.length === 0) {
     body = /* @__PURE__ */(0, import_jsx_runtime.jsx)(import_components.EmptyState, {
       title: t("queryReport.emptyTitle", "No results"),
-      description: t("queryReport.emptyDescription", "The report ran but returned no rows"),
-      action: /* @__PURE__ */(0, import_jsx_runtime.jsx)(import_components.Button, {
+      description: hasVisibleFilters ? t("queryReport.emptyFiltered", "No rows match the current filters") : t("queryReport.emptyDescription", "The report ran but returned no rows"),
+      action: hasVisibleFilters ? /* @__PURE__ */(0, import_jsx_runtime.jsx)(import_components.Button, {
+        chromeless: true,
+        onPress: clearVisibleFilters,
+        children: t("queryReport.clearAllFilters", "Clear all filters")
+      }) : /* @__PURE__ */(0, import_jsx_runtime.jsx)(import_components.Button, {
         chromeless: true,
         onPress: report.reload,
         children: t("queryReport.refresh", "Refresh")
@@ -296,6 +257,7 @@ function QueryReportScreen(param) {
       columns: tableColumns,
       enableSorting: true,
       enableFiltering: false,
+      enableGlobalSearch: false,
       enablePagination: true,
       initialState: {
         pagination: {
@@ -330,20 +292,40 @@ function QueryReportScreen(param) {
           onPress: report.reload,
           disabled: report.loading,
           children: t("queryReport.refresh", "Refresh")
+        }), /* @__PURE__ */(0, import_jsx_runtime.jsx)(import_components.Button, {
+          size: "$2",
+          chromeless: true,
+          icon: import_react2.DownloadSimpleIcon,
+          onPress: handleExport,
+          disabled: report.loading || report.rows.length === 0,
+          children: t("queryReport.exportCsv", "Export CSV")
         })]
       })
     }), report.serverMessage ? /* @__PURE__ */(0, import_jsx_runtime.jsx)(import_components.Text, {
       fontSize: "$2",
       color: "$color10",
       children: (0, import_useQueryReport.stripHtml)(report.serverMessage)
-    }) : null, report.filterMeta.length > 0 ? /* @__PURE__ */(0, import_jsx_runtime.jsx)(ReportFilterBar, {
-      filterMeta: report.filterMeta,
-      filters: report.filters,
-      onApply: report.setFilters
-    }) : null, /* @__PURE__ */(0, import_jsx_runtime.jsx)(import_components.YStack, {
+    }) : null, /* @__PURE__ */(0, import_jsx_runtime.jsxs)(import_components.YStack, {
       flex: 1,
       minWidth: 0,
-      children: body
+      borderWidth: 1,
+      borderColor: "$borderColor",
+      borderRadius: "$4",
+      children: [report.filterMeta.length > 0 ? /* @__PURE__ */(0, import_jsx_runtime.jsx)(import_queryReportFilterBar.QueryReportFilterBar, {
+        filterMeta: report.filterMeta,
+        filters: report.filters,
+        onApply: applyFilters
+      }) : null, !report.loading && report.scriptFilterGap && !report.error ? /* @__PURE__ */(0, import_jsx_runtime.jsx)(import_components.Text, {
+        fontSize: "$2",
+        color: "$color9",
+        paddingHorizontal: "$3",
+        paddingVertical: "$2",
+        children: t("queryReport.scriptFiltersGap", "Some of this report's filters are defined in code and aren't supported here yet")
+      }) : null, /* @__PURE__ */(0, import_jsx_runtime.jsx)(import_components.YStack, {
+        flex: 1,
+        minWidth: 0,
+        children: body
+      })]
     })]
   });
   return import_components.isWeb ? content : /* @__PURE__ */(0, import_jsx_runtime.jsx)(import_components.ScrollView, {