#1203 - display filter names in dashboard listing. fixed bug in setti…

…ng scope.
avniproject · Jul 17, 2024 · d23d337 · d23d337
1 parent c2b330b
commit d23d337
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 4 deletions.
diff --git a/src/adminApp/components/CreateEditFiltersV2.js b/src/adminApp/components/CreateEditFiltersV2.js
@@ -215,7 +215,7 @@ export const CreateEditFiltersV2 = ({ selectedFilter, operationalModules, docume
                   value={_.get(filterConfig.observationBasedFilter, "scope")}
                   options={scopeOptions}
                   onChange={scope => {
-                    filterConfig.observationBasedFilter.scope = scope.value;
+                    filterConfig.observationBasedFilter.setScope(scope.value);
                     updateFilterConfig();
                   }}
                   toolTipKey="APP_DESIGNER_FILTER_SEARCH_SCOPE"

diff --git a/src/formDesigner/components/Dashboard/DashboardList.js b/src/formDesigner/components/Dashboard/DashboardList.js
@@ -7,12 +7,18 @@ const DashboardList = ({ history, userInfo }) => {
   const columns = [
     {
       title: "Name",
-      render: rowData =>
-        !rowData.voided && <a href={`#/appDesigner/dashboard/${rowData.id}/show`}>{rowData.name}</a>
+      render: rowData => !rowData.voided && <a href={`#/appDesigner/dashboard/${rowData.id}/show`}>{rowData.name}</a>,
+      sorting: false
+    },
+    {
+      title: "Filters",
+      render: rowData => rowData.filters.map(filter => filter.name).join(", "),
+      sorting: false
     },
     {
       title: "Description",
-      render: rowData => rowData.description
+      render: rowData => rowData.description,
+      sorting: false
     }
   ];