Merge pull request #1774 from merico-dev/1773-missing-userenderpanelcontext-in-dashboarddts

1773 missing userenderpanelcontext in dashboarddts

Author: GerilLeto

api/package.json

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

dashboard/package.json

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

dashboard/src/dashboard-editor/ui/settings/navbar/action-button/add-a-query.tsx

@@ -3,7 +3,7 @@ import { IconPlus } from '@tabler/icons-react';
 import { observer } from 'mobx-react-lite';
 import { useTranslation } from 'react-i18next';
 import { useEditDashboardContext } from '~/contexts';
-import { DataSourceType, QueryRenderModelInstance } from '~/model';
+import { DataSourceType, IQueryRenderModel } from '~/model';
 
 export const AddAQuery = observer(() => {
   const { t } = useTranslation();
@@ -19,7 +19,7 @@ export const AddAQuery = observer(() => {
         _type: DataSourceType.Postgresql,
         sql: '',
       },
-    } as QueryRenderModelInstance;
+    } as IQueryRenderModel;
     model.content.queries.append(v);
     model.editor.setPath(['_QUERIES_', id]);
   };

dashboard/src/model/render-model/dashboard/content/panels/panel.ts

@@ -1,4 +1,7 @@
+import { ComboboxItem } from '@mantine/core';
+import _ from 'lodash';
 import { getRoot, Instance, SnapshotIn } from 'mobx-state-tree';
+import { MericoPanelGroupsVizComponent } from '~/components/plugins/viz-components/merico-panel-groups';
 import { TableVizComponent } from '~/components/plugins/viz-components/table';
 import { CURRENT_SCHEMA_VERSION } from '~/model/meta-model';
 import { PanelMeta } from '~/model/meta-model/dashboard/content/panel';
@@ -12,11 +15,8 @@ import {
   variablesToStrings,
 } from '~/utils';
 import { downloadJSON } from '~/utils/download';
-import { QueryRenderModelInstance } from '../queries';
+import { IQueryRenderModel } from '../queries';
 import { IPanelRenderModel } from './types';
-import _ from 'lodash';
-import { MericoPanelGroupsVizComponent } from '~/components/plugins/viz-components/merico-panel-groups';
-import { ComboboxItem } from '@mantine/core';
 
 export type VariableValueMap = Record<string, string | number>;
 export type VariableAggValueMap = Record<string, string | number>;
@@ -32,10 +32,10 @@ export const PanelRenderModel = PanelMeta.views((self) => ({
   },
 }))
   .views((self) => ({
-    get queries(): QueryRenderModelInstance[] {
+    get queries(): IQueryRenderModel[] {
       return self.contentModel.queries.findByIDSet(self.queryIDSet);
     },
-    get firstQuery(): QueryRenderModelInstance | null {
+    get firstQuery(): IQueryRenderModel | null {
       if (this.queries.length > 0) {
         return this.queries[0];
       }
@@ -50,7 +50,7 @@ export const PanelRenderModel = PanelMeta.views((self) => ({
     get usingGhostViz() {
       return self.viz.type === MericoPanelGroupsVizComponent.name;
     },
-    queryByID(queryID: string): QueryRenderModelInstance | undefined {
+    queryByID(queryID: string): IQueryRenderModel | undefined {
       return this.queries.find((q) => q.id === queryID);
     },
     get data() {

dashboard/src/model/render-model/dashboard/content/panels/types.ts

@@ -1,15 +1,15 @@
+import { ComboboxItem } from '@mantine/core';
 import type { IObservableArray } from 'mobx';
 import type { ReactNode } from 'react';
 import { IContentRenderModel } from '../../../../../dashboard-render';
 import type { IPanelMeta } from '../../../../meta-model';
-import { type IQueryRenderModel, QueryRenderModelInstance } from '../queries';
+import { type IQueryRenderModel } from '../queries';
 import { VariableAggValueMap, VariableStyleMap, VariableValueMap } from './panel';
-import { ComboboxItem } from '@mantine/core';
 
 export interface IPanelRenderModel extends IPanelMeta {
   readonly contentModel: IContentRenderModel;
-  readonly queries: QueryRenderModelInstance[];
-  readonly firstQuery: QueryRenderModelInstance | null;
+  readonly queries: IQueryRenderModel[];
+  readonly firstQuery: IQueryRenderModel | null;
   readonly firstQueryData: Array<string[] | number[] | Record<string, unknown>>;
   readonly usingGhostViz: boolean;
   readonly data: TPanelData;

dashboard/src/model/render-model/dashboard/content/queries/queries.ts

@@ -1,12 +1,12 @@
 import _ from 'lodash';
-import { Instance, SnapshotIn, flow, getParent, getRoot, types } from 'mobx-state-tree';
 import { IObservableArray } from 'mobx';
+import { Instance, SnapshotIn, flow, getParent, getRoot, types } from 'mobx-state-tree';
 import { CURRENT_SCHEMA_VERSION, QueryMetaSnapshotIn } from '~/model/meta-model';
-import { downloadDataAsCSV, downloadDataListAsZip, downloadJSON } from '~/utils/download';
-import { IContentRenderModel } from '../../../../../dashboard-render';
-import { QueryRenderModel, QueryRenderModelInstance, type IQueryRenderModel } from './query';
 import { TransformQueryMetaInstance } from '~/model/meta-model/dashboard/content/query/transform-query';
 import { typeAssert } from '~/types/utils';
+import { downloadDataAsCSV, downloadDataListAsZip, downloadJSON } from '~/utils/download';
+import { IContentRenderModel } from '../../../../../dashboard-render';
+import { QueryRenderModel, type IQueryRenderModel } from './query';
 
 export const QueriesRenderModel = types
   .model('QueriesRenderModel', {
@@ -65,7 +65,7 @@ export const QueriesRenderModel = types
         }
       });
 
-      this.findByIDSet(new Set(queryIDs)).forEach((q: QueryRenderModelInstance) => {
+      this.findByIDSet(new Set(queryIDs)).forEach((q: IQueryRenderModel) => {
         const config = q.config as TransformQueryMetaInstance;
         if (!q.isTransform || config.dep_query_ids.length === 0) {
           return;
@@ -81,7 +81,7 @@ export const QueriesRenderModel = types
       return this.visibleQueryIDSet.has(queryID);
     },
     addTransformDepQueryIDs(targetSet: Set<string>, excludeSet?: Set<string>) {
-      this.findByIDSet(targetSet).forEach((q: QueryRenderModelInstance) => {
+      this.findByIDSet(targetSet).forEach((q: IQueryRenderModel) => {
         const config = q.config as TransformQueryMetaInstance;
         if (!q.isTransform || config.dep_query_ids.length === 0) {
           return;

package.json

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

settings-form/package.json

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

website/package.json

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