add orderby support, fix log on axes

apache · Sep 19, 2023 · adc4848 · adc4848
1 parent 15fb7d6
commit adc4848
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 4 deletions.
diff --git a/superset-frontend/plugins/plugin-chart-echarts/src/Bubble/buildQuery.ts b/superset-frontend/plugins/plugin-chart-echarts/src/Bubble/buildQuery.ts
@@ -32,7 +32,9 @@ export default function buildQuery(formData: QueryFormData) {
     {
       ...baseQueryObject,
       columns,
-      row_limit: formData.limit,
+      orderby: baseQueryObject.orderby
+        ? [[baseQueryObject.orderby[0], !baseQueryObject.order_desc]]
+        : undefined,
     },
   ]);
 }
diff --git a/superset-frontend/plugins/plugin-chart-echarts/src/Bubble/controlPanel.tsx b/superset-frontend/plugins/plugin-chart-echarts/src/Bubble/controlPanel.tsx
@@ -44,7 +44,17 @@ const config: ControlPanelConfig = {
         ['y'],
         ['adhoc_filters'],
         ['size'],
-        ['limit', null],
+        ['orderby'],
+        [
+          {
+            name: 'order_desc',
+            config: {
+              ...sharedControls.order_desc,
+              visibility: ({ controls }) => Boolean(controls.orderby.value),
+            },
+          },
+        ],
+        ['row_limit'],
         // emitFilterControl,
       ],
     },
@@ -164,7 +174,7 @@ const config: ControlPanelConfig = {
         ],
         [
           {
-            name: 'logYAxis',
+            name: 'logXAxis',
             config: {
               type: 'CheckboxControl',
               label: t('Logarithmic x-axis'),
@@ -228,7 +238,7 @@ const config: ControlPanelConfig = {
         ['y_axis_format'],
         [
           {
-            name: 'logXAxis',
+            name: 'logYAxis',
             config: {
               type: 'CheckboxControl',
               label: t('Logarithmic y-axis'),