Merge pull request #1223 from merico-dev/1219-query-usage-counts-wrong-ignoring-main-views-filters

1219 query usage counts wrong, ignoring filters

Author: GerilLeto

api/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@devtable/api",
-  "version": "10.42.2",
+  "version": "10.42.3",
   "description": "",
   "main": "index.js",
   "scripts": {

dashboard/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@devtable/dashboard",
-  "version": "10.42.2",
+  "version": "10.42.3",
   "license": "Apache-2.0",
   "publishConfig": {
     "access": "public",

dashboard/src/dashboard-editor/model/content/index.ts

@@ -210,16 +210,18 @@ const _ContentModel = types
           const filterQueryID = _.get(f, 'config.options_query_id');
           return !!filterQueryID;
         })
-        .map((f) => ({
-          type: 'filter',
-          id: f.id,
-          queryID: _.get(f, 'config.options_query_id'),
-          label: f.label,
-          views: f.visibleInViewsIDs.map((id) => ({
-            id,
-            label: viewIDMap.get(id)?.name ?? id,
-          })),
-        }));
+        .forEach((f) => {
+          usages.push({
+            type: 'filter',
+            id: f.id,
+            queryID: _.get(f, 'config.options_query_id'),
+            label: f.label,
+            views: f.visibleInViewsIDs.map((id) => ({
+              id,
+              label: viewIDMap.get(id)?.name ?? id,
+            })),
+          });
+        });
 
       return _.groupBy(usages, 'queryID');
     },

dashboard/src/dashboard-editor/ui/settings/content/edit-query/query-editor-form/query-usage.tsx

@@ -48,7 +48,7 @@ export const QueryUsage = observer(({ queryID, usage }: IQueryUsage) => {
               <td>
                 <Stack align="flex-start" justify="flex-start" spacing={2}>
                   {u.views.map((v) => (
-                    <Anchor component="button" type="button" onClick={() => openView(v.id)}>
+                    <Anchor key={v.id} component="button" type="button" onClick={() => openView(v.id)}>
                       <Box>{v.label}</Box>
                     </Anchor>
                   ))}

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@devtable/root",
-  "version": "10.42.2",
+  "version": "10.42.3",
   "private": true,
   "workspaces": [
     "api",

settings-form/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@devtable/settings-form",
-  "version": "10.42.2",
+  "version": "10.42.3",
   "license": "Apache-2.0",
   "publishConfig": {
     "access": "public",

website/package.json

@@ -2,7 +2,7 @@
   "name": "@devtable/website",
   "private": true,
   "license": "Apache-2.0",
-  "version": "10.42.2",
+  "version": "10.42.3",
   "scripts": {
     "dev": "vite",
     "preview": "vite preview"