Merge pull request #671 from neuroscout/590_540_fix_subject_filter

Add ReplaceNA to scale xform, fix unselect all predictors error.
neuroscout · Oct 9, 2019 · df763f6 · df763f6
2 parents 33b8449 + 2134b24
commit df763f6
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 4 deletions.
diff --git a/neuroscout/frontend/src/analysis_builder/Builder.tsx b/neuroscout/frontend/src/analysis_builder/Builder.tsx
@@ -926,6 +926,7 @@ export default class AnalysisBuilder extends Reflux.Component<any, BuilderProps
       if (data === null) {
         return;
       }
+
       // If there is a statusCode we do not have a list of predictors
       if ((data as any).statusCode === undefined) {
         this.setState({

diff --git a/neuroscout/frontend/src/analysis_builder/Transformations.tsx b/neuroscout/frontend/src/analysis_builder/Transformations.tsx
@@ -238,7 +238,7 @@ class ParameterField extends React.Component<ParameterFieldProps> {
           </div>
           </Row>
         )}
-        {name === 'replace_na' && this.ReplaceNAField()}
+        {name === 'ReplaceNA' && this.ReplaceNAField()}
       </span>
     );
   }

diff --git a/neuroscout/frontend/src/analysis_builder/transforms.ts b/neuroscout/frontend/src/analysis_builder/transforms.ts
@@ -1,4 +1,4 @@
-import { Transformation } from '../coretypes';
+import { Transformation, ReplaceNA } from '../coretypes';
 
 // Todo: Add more transformations, from pybids
 // At first, only allow transformations that occur in place
@@ -13,6 +13,7 @@ const transformDefinitions: Transformation[] = [
     Name: 'Scale',
     Demean: true,
     Rescale: true,
+    ReplaceNA: 'None' as ReplaceNA
   },
   {
     Name: 'Orthogonalize',

diff --git a/neuroscout/frontend/src/api.ts b/neuroscout/frontend/src/api.ts
@@ -74,7 +74,12 @@ export const api = {
   },
 
   getPredictors: (ids: (number[] | string[])): Promise<Predictor[] | null> => {
-    return jwtFetch(`${domainRoot}/api/predictors?run_id=${ids}`);
+    return jwtFetch(`${domainRoot}/api/predictors?run_id=${ids}`).then((data) => {
+      if (data.statusCode && data.statusCode === 422) {
+        return [] as Predictor[];
+      }
+      return data;
+    });
   },
 
   getDataset: (datasetId: (number | string)): Promise<(Dataset | null)> => {

diff --git a/neuroscout/frontend/src/coretypes.ts b/neuroscout/frontend/src/coretypes.ts
@@ -117,7 +117,7 @@ export type ReplaceNA = 'before' | 'after' | undefined;
 
 export interface Transformation {
   Name: TransformName;
-  ReplaceNa?: ReplaceNA;
+  ReplaceNA?: ReplaceNA;
   Input?: string[]; // predictor IDs
   Output?: string[];
   Demean?: boolean;