Fix handler class used for seurat processing jobs

bbimber · bbimber · commit 5554581bd23e · 2021-02-19T13:51:58.000-08:00
diff --git a/singlecell/resources/views/singleCellProcessing.html b/singlecell/resources/views/singleCellProcessing.html
@@ -3,7 +3,8 @@
         var webpart = <%=webpartContext%>;
 
         Ext4.create('SingleCell.panel.SingleCellProcessingPanel', {
-            outputFileIds: LABKEY.ActionURL.getParameter("outputFileIds") ? LABKEY.ActionURL.getParameter("outputFileIds").split(';') : []
+            outputFileIds: LABKEY.ActionURL.getParameter("outputFileIds") ? LABKEY.ActionURL.getParameter("outputFileIds").split(';') : [],
+            inputType: LABKEY.ActionURL.getParameter("handlerClass") || 'ProcessSeuratObjectHandler'
         }).render(webpart.wrapperDivId);
     });
 
diff --git a/singlecell/resources/web/singlecell/panel/SingleCellProcessingPanel.js b/singlecell/resources/web/singlecell/panel/SingleCellProcessingPanel.js
@@ -1,6 +1,7 @@
 Ext4.define('SingleCell.panel.SingleCellProcessingPanel', {
     extend: 'SequenceAnalysis.panel.BaseSequencePanel',
     alias: 'widget.singlecell-singlecellprocessingpanel',
+    handlerClass: 'ProcessSingleCellHandler',
 
     jobType: 'singleCell',
 
@@ -250,7 +251,7 @@ Ext4.define('SingleCell.panel.SingleCellProcessingPanel', {
 
         Ext4.Msg.wait('Submitting...');
         var json = {
-            handlerClass: 'org.labkey.singlecell.analysis.ProcessSingleCellHandler',
+            handlerClass: 'org.labkey.singlecell.analysis.' + this.handlerClass,
             outputFileIds: this.outputFileIds,
             params: Ext4.encode(values)
         };
diff --git a/singlecell/src/org/labkey/singlecell/analysis/AbstractSingleCellHandler.java b/singlecell/src/org/labkey/singlecell/analysis/AbstractSingleCellHandler.java
@@ -68,12 +68,6 @@ public String getDescription()
         return "Run one or more tools to process 10x scRNA-seq Data";
     }
 
-    @Override
-    public ActionURL getButtonSuccessUrl(Container c, User u, List<Integer> outputFileIds)
-    {
-        return DetailsURL.fromString("/singlecell/singleCellProcessing.view?outputFileIds=" + StringUtils.join(outputFileIds, ";"), c).getActionURL();
-    }
-
     @Override
     public String getButtonJSHandler()
     {
diff --git a/singlecell/src/org/labkey/singlecell/analysis/ProcessSeuratObjectHandler.java b/singlecell/src/org/labkey/singlecell/analysis/ProcessSeuratObjectHandler.java
@@ -27,6 +27,12 @@ public boolean canProcess(SequenceOutputFile f)
         return f.getFile() != null && SEURAT_TYPE.isType(f.getFile());
     }
 
+    @Override
+    public ActionURL getButtonSuccessUrl(Container c, User u, List<Integer> outputFileIds)
+    {
+        return DetailsURL.fromString("/singlecell/singleCellProcessing.view?handlerClass=ProcessSeuratObjectHandler&outputFileIds=" + StringUtils.join(outputFileIds, ";"), c).getActionURL();
+    }
+
     @Override
     public SequenceOutputProcessor getProcessor()
     {
diff --git a/singlecell/src/org/labkey/singlecell/analysis/ProcessSingleCellHandler.java b/singlecell/src/org/labkey/singlecell/analysis/ProcessSingleCellHandler.java
@@ -26,6 +26,12 @@ public boolean canProcess(SequenceOutputFile f)
         return f.getFile() != null && LOUPE_TYPE.isType(f.getFile());
     }
 
+    @Override
+    public ActionURL getButtonSuccessUrl(Container c, User u, List<Integer> outputFileIds)
+    {
+        return DetailsURL.fromString("/singlecell/singleCellProcessing.view?handlerClass=ProcessSingleCellHandler&outputFileIds=" + StringUtils.join(outputFileIds, ";"), c).getActionURL();
+    }
+
     @Override
     public SequenceOutputProcessor getProcessor()
     {

Original file line number	Diff line number	Diff line change
`@@ -68,12 +68,6 @@ public String getDescription()`
`68`	`68`	`return "Run one or more tools to process 10x scRNA-seq Data";`
`69`	`69`	`}`
`70`	`70`
`71`		`- @Override`
`72`		`- public ActionURL getButtonSuccessUrl(Container c, User u, List<Integer> outputFileIds)`
`73`		`- {`
`74`		`- return DetailsURL.fromString("/singlecell/singleCellProcessing.view?outputFileIds=" + StringUtils.join(outputFileIds, ";"), c).getActionURL();`
`75`		`- }`
`76`		`-`
`77`	`71`	`@Override`
`78`	`72`	`public String getButtonJSHandler()`
`79`	`73`	`{`
Original file line number	Diff line number	Diff line change
`@@ -27,6 +27,12 @@ public boolean canProcess(SequenceOutputFile f)`
`27`	`27`	`return f.getFile() != null && SEURAT_TYPE.isType(f.getFile());`
`28`	`28`	`}`
`29`	`29`
	`30`	`+ @Override`
	`31`	`+ public ActionURL getButtonSuccessUrl(Container c, User u, List<Integer> outputFileIds)`
	`32`	`+ {`
	`33`	`+ return DetailsURL.fromString("/singlecell/singleCellProcessing.view?handlerClass=ProcessSeuratObjectHandler&outputFileIds=" + StringUtils.join(outputFileIds, ";"), c).getActionURL();`
	`34`	`+ }`
	`35`	`+`
`30`	`36`	`@Override`
`31`	`37`	`public SequenceOutputProcessor getProcessor()`
`32`	`38`	`{`
Original file line number	Diff line number	Diff line change
`@@ -26,6 +26,12 @@ public boolean canProcess(SequenceOutputFile f)`
`26`	`26`	`return f.getFile() != null && LOUPE_TYPE.isType(f.getFile());`
`27`	`27`	`}`
`28`	`28`
	`29`	`+ @Override`
	`30`	`+ public ActionURL getButtonSuccessUrl(Container c, User u, List<Integer> outputFileIds)`
	`31`	`+ {`
	`32`	`+ return DetailsURL.fromString("/singlecell/singleCellProcessing.view?handlerClass=ProcessSingleCellHandler&outputFileIds=" + StringUtils.join(outputFileIds, ";"), c).getActionURL();`
	`33`	`+ }`
	`34`	`+`
`29`	`35`	`@Override`
`30`	`36`	`public SequenceOutputProcessor getProcessor()`
`31`	`37`	`{`