Get data function parameters refactoring

surveyjs · Jun 28, 2024 · c228972 · c228972
1 parent 4afed82
commit c228972
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 11 deletions.
diff --git a/examples/summary-remote.js b/examples/summary-remote.js
@@ -250,34 +250,34 @@ const summaryData = {
   "favorite_functionality_text": { columnsCount: 2, data: [["aswdasdasd sadf asfda sd"], ["sdf sdf sdf sfdasdf ga"], ["word", "some text"]] },
 }
 
-// function getSummaryData({ visualizer, questionName, filter, callback }) {
+// function getSummaryData({ visualizer, filter, callback }) {
 //   console.log(JSON.stringify(filter));
 //   setTimeout(() => {
 //     callback({ data: summaryData[questionName + "_" + visualizer.type] });
 //   }, 1000);
 // }
 
-// function getSummaryData({ visualizer, questionName, filter }) {
+// function getSummaryData({ visualizer, filter }) {
 //   const url = "http://www.example.com/";
-//   const reqBody = { questionName, filter, type: visualizer.type };
+//   const reqBody = { visualizer.name, filter, type: visualizer.type };
 //   return fetch(url, { body: reqBody });
 // }
 
-function getSummaryData({ visualizer, questionName, filter }) {
-  console.log("Question: " + JSON.stringify(questionName));
+function getSummaryData({ visualizer, filter }) {
+  console.log("Question: " + JSON.stringify(visualizer.name));
   console.log("Filter: " + JSON.stringify(filter));
   return new Promise((resolve, reject) => {
-    let dataSetName = questionName;
+    let dataSetName = visualizer.name;
     if(["histogram", "number", "wordcloud", "text"].indexOf(visualizer.type) != -1) {
       dataSetName += "_" + visualizer.type;
     }
-    const data = summaryData[dataSetName] || summaryData[questionName];
+    const data = summaryData[dataSetName] || summaryData[visualizer.name];
     if(data !== undefined) {
       setTimeout(() => {
         resolve(data);
       }, 1000);
     } else {
-      reject("Invalid question name " + questionName);
+      reject("Haven't found data for " + visualizer.name);
     }
   });
 }

diff --git a/src/dataProvider.ts b/src/dataProvider.ts
@@ -1,8 +1,8 @@
 import { Event } from "survey-core";
 
 export type SummaryFilter = { field: string, type: string, value: any };
-export type GetDataUsingCallbackFn = (params: { visualizer: any, questionName: string, filter?: Array<SummaryFilter>, callback?: (response: { data: Array<Object>, error?: any }) => void }) => void;
-export type GetDataUsingPromiseFn = (params: { visualizer: any, questionName: string, filter?: Array<SummaryFilter> }) => Promise<Array<Object>>;
+export type GetDataUsingCallbackFn = (params: { visualizer: any, filter?: Array<SummaryFilter>, callback?: (response: { data: Array<Object>, error?: any }) => void }) => void;
+export type GetDataUsingPromiseFn = (params: { visualizer: any, filter?: Array<SummaryFilter> }) => Promise<Array<Object>>;
 export type GetDataFn = GetDataUsingCallbackFn | GetDataUsingPromiseFn;
 
 export class DataProvider {

diff --git a/src/visualizerBase.ts b/src/visualizerBase.ts
@@ -708,7 +708,6 @@ export class VisualizerBase implements IDataInfo {
       if(!!this.dataProvider.dataFn) {
         this.loadingData = true;
         const dataLoadingPromise = this.dataProvider.dataFn({
-          questionName: this.name,
           visualizer: this,
           filter: this.dataProvider.getFilters(),
           callback: (loadedData: { data: Array<Object>, error?: any }) => {