fix: move editable to context

Kong · Nov 1, 2024 · bd46c63 · bd46c63
1 parent b103fc2
commit bd46c63
Show file tree

Hide file tree

Showing 6 changed files with 7 additions and 13 deletions.
diff --git a/packages/analytics/dashboard-renderer/sandbox/pages/RendererDemo.vue b/packages/analytics/dashboard-renderer/sandbox/pages/RendererDemo.vue
@@ -46,6 +46,7 @@ const appLinks: SandboxNavigationItem[] = inject('app-links', [])
 const context: DashboardRendererContext = {
   filters: [],
   refreshInterval: 0,
+  editable: true,
 }
 
 const dashboardConfig: DashboardConfig = {
@@ -136,7 +137,6 @@ const dashboardConfig: DashboardConfig = {
           datasource: 'basic',
           dimensions: ['route'],
         },
-        editable: true,
       },
       layout: {
         position: {
@@ -159,7 +159,6 @@ const dashboardConfig: DashboardConfig = {
           datasource: 'basic',
           dimensions: ['time'],
         },
-        editable: true,
       },
       layout: {
         position: {

diff --git a/packages/analytics/dashboard-renderer/src/components/BarChartRenderer.vue b/packages/analytics/dashboard-renderer/src/components/BarChartRenderer.vue
@@ -3,7 +3,7 @@
   <BaseAnalyticsChartRenderer
     :chart-options="chartOptions"
     :context="context"
-    :editable="editable"
+    :editable="context.editable"
     :extra-props="{ showAnnotations: false }"
     :height="height"
     :query="query"

diff --git a/packages/analytics/dashboard-renderer/src/components/BaseAnalyticsChartRenderer.vue b/packages/analytics/dashboard-renderer/src/components/BaseAnalyticsChartRenderer.vue
@@ -12,13 +12,13 @@
         :chart-options="options"
         :chart-title="chartOptions.chartTitle"
         legend-position="bottom"
-        :show-menu="editable"
+        :show-menu="context.editable"
         :synthetics-data-key="chartOptions.syntheticsDataKey"
         tooltip-title=""
         v-bind="extraProps"
       >
         <template
-          v-if="editable"
+          v-if="context.editable"
           #menu-items
         >
           <KDropdownItem @click="editTile">

diff --git a/packages/analytics/dashboard-renderer/src/components/DashboardTile.vue b/packages/analytics/dashboard-renderer/src/components/DashboardTile.vue
@@ -61,7 +61,7 @@ const componentData = computed(() => {
       queryReady: props.queryReady,
       chartOptions: props.definition.chart,
       height: props.height - PADDING_SIZE * 2,
-      editable: props.definition.editable,
+      editable: props.context.editable,
     },
   }
 })

diff --git a/packages/analytics/dashboard-renderer/src/components/TimeseriesChartRenderer.vue b/packages/analytics/dashboard-renderer/src/components/TimeseriesChartRenderer.vue
@@ -3,7 +3,7 @@
   <BaseAnalyticsChartRenderer
     :chart-options="chartOptions"
     :context="context"
-    :editable="editable"
+    :editable="context.editable"
     :height="height"
     :query="query"
     :query-ready="queryReady"

diff --git a/packages/analytics/dashboard-renderer/src/types/dashboard-renderer-types.ts b/packages/analytics/dashboard-renderer/src/types/dashboard-renderer-types.ts
@@ -22,6 +22,7 @@ export interface DashboardRendererContext {
   timeSpec?: TimeRangeV4
   tz?: string
   refreshInterval?: number
+  editable?: boolean
 }
 
 type FromSchemaWithOptions<T extends JSONSchema> = FromSchema<T, { keepDefaultedPropertiesOptional: true }>
@@ -59,10 +60,6 @@ const goToExplore = {
   type: 'string',
 } as const
 
-const editable = {
-  type: 'boolean',
-} as const
-
 const chartDatasetColorsSchema = {
   type: ['object', 'array'],
   items: {
@@ -408,7 +405,6 @@ export const tileDefinitionSchema = {
     chart: {
       anyOf: [barChartSchema, gaugeChartSchema, timeseriesChartSchema, metricCardSchema, topNTableSchema, slottableSchema],
     },
-    editable,
   },
   required: ['query', 'chart'],
   additionalProperties: false,
@@ -508,5 +504,4 @@ export interface RendererProps<T> {
   queryReady: boolean
   chartOptions: T
   height: number
-  editable?: boolean
 }