From 6d2ed4c293c1ab479ec1400ae38657ce2d396df9 Mon Sep 17 00:00:00 2001
From: Adam Rauch <adam@labkey.com>
Date: Wed, 12 Jun 2024 11:31:04 -0700
Subject: [PATCH 1/2] Repackage protein api classes

---
 src/org/labkey/mq/MqModule.java                    | 2 +-
 src/org/labkey/mq/MqProteinSearchViewProvider.java | 2 +-
 src/org/labkey/mq/view/ProteinSearchWebPart.java   | 2 +-
 src/org/labkey/mq/view/proteinSearch.jsp           | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/org/labkey/mq/MqModule.java b/src/org/labkey/mq/MqModule.java
index 9a3c0c8..a059b87 100644
--- a/src/org/labkey/mq/MqModule.java
+++ b/src/org/labkey/mq/MqModule.java
@@ -27,7 +27,7 @@
 import org.labkey.api.module.FolderTypeManager;
 import org.labkey.api.module.ModuleContext;
 import org.labkey.api.pipeline.PipelineService;
-import org.labkey.api.protein.ProteinSearchForm;
+import org.labkey.api.protein.search.ProteinSearchForm;
 import org.labkey.api.protein.ProteinService;
 import org.labkey.api.query.QueryService;
 import org.labkey.api.query.QuerySettings;
diff --git a/src/org/labkey/mq/MqProteinSearchViewProvider.java b/src/org/labkey/mq/MqProteinSearchViewProvider.java
index c63e3b8..c8f1c5d 100644
--- a/src/org/labkey/mq/MqProteinSearchViewProvider.java
+++ b/src/org/labkey/mq/MqProteinSearchViewProvider.java
@@ -6,7 +6,7 @@
 import org.labkey.api.data.SQLFragment;
 import org.labkey.api.data.TableInfo;
 import org.labkey.api.module.ModuleLoader;
-import org.labkey.api.protein.ProteinSearchForm;
+import org.labkey.api.protein.search.ProteinSearchForm;
 import org.labkey.api.query.FieldKey;
 import org.labkey.api.query.FilteredTable;
 import org.labkey.api.query.QuerySettings;
diff --git a/src/org/labkey/mq/view/ProteinSearchWebPart.java b/src/org/labkey/mq/view/ProteinSearchWebPart.java
index fcdb761..0f18ac3 100644
--- a/src/org/labkey/mq/view/ProteinSearchWebPart.java
+++ b/src/org/labkey/mq/view/ProteinSearchWebPart.java
@@ -1,7 +1,7 @@
 package org.labkey.mq.view;
 
 import org.labkey.api.module.ModuleLoader;
-import org.labkey.api.protein.ProteinSearchForm;
+import org.labkey.api.protein.search.ProteinSearchForm;
 import org.labkey.api.protein.ProteinService;
 import org.labkey.api.view.JspView;
 import org.labkey.api.view.ViewContext;
diff --git a/src/org/labkey/mq/view/proteinSearch.jsp b/src/org/labkey/mq/view/proteinSearch.jsp
index 22331d0..aa4e5f0 100644
--- a/src/org/labkey/mq/view/proteinSearch.jsp
+++ b/src/org/labkey/mq/view/proteinSearch.jsp
@@ -1,5 +1,5 @@
 <%@ page import="org.labkey.api.ms2.MS2Urls" %>
-<%@ page import="org.labkey.api.protein.ProteinSearchForm" %>
+<%@ page import="org.labkey.api.protein.search.ProteinSearchForm" %>
 <%@ page import="org.labkey.api.view.HttpView" %>
 <%@ page import="org.labkey.api.view.JspView" %>
 <%@ taglib prefix="labkey" uri="http://www.labkey.org/taglib" %>

From da2bb089d9efff1df0fda5cdccb463df2b758d56 Mon Sep 17 00:00:00 2001
From: Adam Rauch <adam@labkey.com>
Date: Thu, 13 Jun 2024 14:03:04 -0700
Subject: [PATCH 2/2] Prep to move DoProteinSearchAction

---
 src/org/labkey/mq/view/proteinSearch.jsp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/org/labkey/mq/view/proteinSearch.jsp b/src/org/labkey/mq/view/proteinSearch.jsp
index aa4e5f0..d4b8317 100644
--- a/src/org/labkey/mq/view/proteinSearch.jsp
+++ b/src/org/labkey/mq/view/proteinSearch.jsp
@@ -1,4 +1,4 @@
-<%@ page import="org.labkey.api.ms2.MS2Urls" %>
+<%@ page import="org.labkey.api.protein.ProteinService" %>
 <%@ page import="org.labkey.api.protein.search.ProteinSearchForm" %>
 <%@ page import="org.labkey.api.view.HttpView" %>
 <%@ page import="org.labkey.api.view.JspView" %>
@@ -9,7 +9,7 @@
     ProteinSearchForm bean = me.getModelBean();
 %>
 
-<labkey:form layout="horizontal" action="<%=urlProvider(MS2Urls.class).getProteinSearchUrl(getContainer())%>">
+<labkey:form layout="horizontal" action="<%=ProteinService.get().getProteinSearchUrl(getContainer())%>">
     <labkey:input type="text"
                   id="identifierInput"
                   name="identifier"