saving for now

apache · Jul 22, 2021 · c145800 · c145800
1 parent 6ddfd66
commit c145800
Show file tree

Hide file tree

Showing 3 changed files with 30 additions and 2 deletions.
diff --git a/superset-frontend/src/explore/components/PropertiesModal/index.tsx b/superset-frontend/src/explore/components/PropertiesModal/index.tsx
@@ -23,10 +23,11 @@ import Button from 'src/components/Button';
 import { OptionsType } from 'react-select/src/types';
 import { AsyncSelect } from 'src/components/Select';
 import rison from 'rison';
-import { t, SupersetClient } from '@superset-ui/core';
+import { t, SupersetClient, QueryFormData } from '@superset-ui/core';
 import Chart, { Slice } from 'src/types/Chart';
 import { Form, FormItem } from 'src/components/Form';
 import { getClientErrorObject } from 'src/utils/getClientErrorObject';
+import { buildV1ChartDataPayload } from '../../exploreUtils';
 
 type PropertiesModalProps = {
   slice: Slice;
@@ -70,7 +71,9 @@ export default function PropertiesModal({
 
   const fetchChartData = useCallback(
     async function fetchChartData() {
+      console.log(slice);
       try {
+        console.log('fetching chart data!');
         const response = await SupersetClient.get({
           endpoint: `/api/v1/chart/${slice.slice_id}`,
         });
@@ -81,6 +84,26 @@ export default function PropertiesModal({
             label: `${owner.first_name} ${owner.last_name}`,
           })),
         );
+
+        if (chart.query_context === null) {
+          // Build query context
+          const queryContext = buildV1ChartDataPayload({
+            formData: slice.form_data as QueryFormData,
+            force: false,
+            resultFormat: 'json',
+            resultType: 'full',
+          });
+
+          console.log('queryContext', queryContext);
+
+          // Todo: Make PUT to update query context
+          // const response = await makeApi({
+          //   method: 'PUT',
+          //   endpoint: `/api/v1/chart/${}`,
+          // })(`q=${queryParams}`);
+        }
+
+        // set query_context if null
       } catch (response) {
         const clientError = await getClientErrorObject(response);
         showError(clientError);

diff --git a/superset-frontend/src/explore/exploreUtils/index.js b/superset-frontend/src/explore/exploreUtils/index.js
@@ -303,6 +303,8 @@ export const exportChart = ({
       ownState,
     });
   }
+
+  console.log('making POST for getting data');
   postForm(url, payload);
 };
 

diff --git a/superset/charts/api.py b/superset/charts/api.py
@@ -129,6 +129,7 @@ def ensure_thumbnails_enabled(self) -> Optional[Response]:
         "params",
         "slice_name",
         "viz_type",
+        "query_context",
     ]
     show_select_columns = show_columns + ["table.id"]
     list_columns = [
@@ -337,6 +338,9 @@ def put(self, pk: int) -> Response:
             500:
               $ref: '#/components/responses/500'
         """
+        logger.info("*" * 20)
+        logger.info("hit put endpoint!!")
+        logger.info("*" * 20)
 
         if not request.is_json:
             return self.response_400(message="Request is not JSON")
@@ -345,7 +349,6 @@ def put(self, pk: int) -> Response:
         # This validates custom Schema with custom validations
         except ValidationError as error:
             return self.response_400(message=error.messages)
-
         try:
             changed_model = UpdateChartCommand(g.user, pk, item).run()
             response = self.response(200, id=changed_model.id, result=item)