multiple input cohorts now work for createAutomatically

Caleydo · Sep 17, 2023 · b80aee4 · b80aee4
1 parent 379619d
commit b80aee4
Show file tree

Hide file tree

Showing 6 changed files with 20 additions and 21 deletions.
diff --git a/src/Taskview/Taskview.ts b/src/Taskview/Taskview.ts
@@ -673,16 +673,17 @@ export default class Taskview {
           taskWithSelectedOutput.push(currTaskParam);
         }
       }
-      // Update the input cohorts
-      this.updateInput();
+    }
 
-      // show the preview for the current task
-      this.$node.dispatchEvent(new PreviewChangeEvent(taskWithSelectedOutput, this.taskAttributes));
+    // Update the input cohorts
+    this.updateInput();
 
-      // Add the new cohorts to the output side
-      this.setOutputCohorts(outputCohorts);
-      ev.detail.desc[0].attr.forEach((att) => this.addAttributeColumn(att));
-    }
+    // show the preview for the current task
+    this.$node.dispatchEvent(new PreviewChangeEvent(taskWithSelectedOutput, this.taskAttributes));
+
+    // Add the new cohorts to the output side
+    this.setOutputCohorts(outputCohorts);
+    ev.detail.desc[0].attr.forEach((att) => this.addAttributeColumn(att));
   }
 
   async handleFilterEvent(ev: FilterEvent | SplitEvent) {

diff --git a/src/Taskview/visualizations/AVegaVisualization.ts b/src/Taskview/visualizations/AVegaVisualization.ts
@@ -23,7 +23,7 @@ import {
 
 import {
   recommendSplit,
-  createAutomatically, createDBCohortAutomatically
+  createDBCohortAutomatically
 } from './../../base/rest';
 
 export const MISSING_VALUES_LABEL = 'Missing Values';
@@ -256,7 +256,7 @@ export abstract class AVegaVisualization implements IVegaVisualization {
   abstract show(container: HTMLDivElement, attributes: IAttribute[], cohorts: ICohort[]);
   abstract filter(): void;
   abstract split(): void;
-  abstract createAutomatically(): void;
+  abstract createAutomatically?(): void;
   abstract showImpl(chart: HTMLDivElement, data: Array<IdValuePair>); // probably the method impl from SingleAttributeVisualization can be moved here
 
   destroy() {
@@ -700,21 +700,17 @@ export abstract class SingleAttributeVisualization extends AVegaVisualization {
 
     const bins = this.getSelectedData();
     let newCohortIds = [];
-    if (bins.length === 1) { // TODO: what about more than one?
-      let cohort = bins[0].cohort;
+    let cohortDescs: INewCohortDesc[];
+    cohortDescs = [];
+    for (const cohort of this.cohorts) {
       const params: ICohortMultiAttrDBDataParams = {
         cohortId: cohort.dbId,
         attribute0: this.attribute.dataKey,
         attribute0type: this.attribute.type
       };
       newCohortIds = await createDBCohortAutomatically(params)
       console.log("createAutomatically data", newCohortIds);
-    }
 
-    let cohortDescs: INewCohortDesc[];
-    cohortDescs = [];
-    // for every selected cohort
-    for (const cohort of this.cohorts) {
       // for every newCohort create a filter (for now... the filter is actually not needed, will be changed in the future)
       for (const newCohort of newCohortIds){
         cohortDescs.push({
@@ -724,7 +720,6 @@ export abstract class SingleAttributeVisualization extends AVegaVisualization {
         });
       }
     }
-
     this.container.dispatchEvent(new AutoSplitEvent(cohortDescs));
   }
 

diff --git a/src/Taskview/visualizations/AreaChart.ts b/src/Taskview/visualizations/AreaChart.ts
@@ -13,6 +13,10 @@ export class AreaChart extends MultiAttributeVisualization {
     super(vegaLiteOptions);
   }
 
+  async createAutomatically() {
+    log.info('no automatic creation for Area Chart yet');
+  }
+
   getSpec(data: IdValuePair[]): VegaLiteSpec {
     if (!(this.attributes.length === 2 && this.attributes.every((attr) => ['categorical', 'string'].includes(attr.type)))) {
       throw new Error(`Area chart requires attributes of type categorical`); // TODO generalize, could also be used for binned numerical

diff --git a/src/Taskview/visualizations/Scatterplot.ts b/src/Taskview/visualizations/Scatterplot.ts
@@ -20,7 +20,6 @@ import { AxisType, MultiAttributeVisualization } from './MultiAttributeVisualiza
 
 import {
   createDBCohortAutomatically,
-  createAutomatically
 } from '../../base/rest';
 
 export class Scatterplot extends MultiAttributeVisualization {

diff --git a/src/data/Attribute.ts b/src/data/Attribute.ts
@@ -111,7 +111,7 @@ export class ServerColumnAttribute extends Attribute {
     if (autofilter) {
       if (Array.isArray(filter)) {
         const label = rangeLabel || "label";
-        return createCohortAutoSplit(cht, niceName(this.id), "label", this.id, filter, newCohortId);
+        return createCohortAutoSplit(cht, niceName(this.id), "label", this.id, newCohortId);
       }
     }
 

diff --git a/src/data/IAttribute.ts b/src/data/IAttribute.ts
@@ -125,7 +125,7 @@ export interface IAttribute {
 
   filter(cht: ICohort, filter: INumRange[] | IEqualsList, rangeLabel?: string): Promise<ICohort>;
 
-  getAutoCohort(cht: ICohort, attribute: IAttribute, newCohortId: number): Promise<ICohort>;
+  getAutoCohort?(cht: ICohort, attribute: IAttribute, newCohortId: number): Promise<ICohort>;
 
   toJSON();
 }