Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

SWC-6853 #5521

Merged
merged 2 commits into from
Sep 16, 2024
Merged

SWC-6853 #5521

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c741f9e
SWC-6853
nickgros Sep 16, 2024
b920ba3
SWC-6853
nickgros Sep 16, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
<webappDirectory>
${project.build.directory}/${project.build.finalName}
</webappDirectory>
<synapse.version>499.0</synapse.version>
<synapse.version>514.0</synapse.version>
<gwtVersion>2.11.0</gwtVersion>
<org.springframework.version>5.3.37</org.springframework.version>
<guiceVersion>6.0.0</guiceVersion>
Expand Down Expand Up @@ -758,7 +758,7 @@
<dependency>
<groupId>org.sagebionetworks</groupId>
<artifactId>csv-utilities</artifactId>
<version>1.0.4</version>
<version>${synapse.version}</version>
</dependency>
<dependency>
<groupId>com.amazonaws</groupId>
Expand Down
1 change: 1 addition & 0 deletions src/main/java/org/sagebionetworks/web/client/SynapseJavascriptClient.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -321,6 +321,7 @@ public class SynapseJavascriptClient {
public static final String DOWNLOAD_LIST_MANIFEST_V2 =
"/download/list/package/";
public static final String FILE_HANDLE_RESTORE = "/fileHandle/restore/";
public static final String AGENT_CHAT = "/agent/chat/";

public static final String ASYNC_START = "/async/start";
public static final String ASYNC_GET = "/async/get/";
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/org/sagebionetworks/web/client/widget/entity/download/Uploader.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
package org.sagebionetworks.web.client.widget.entity.download;

import static com.google.common.util.concurrent.MoreExecutors.directExecutor;
import static org.sagebionetworks.repo.model.util.ModelConstants.VALID_ENTITY_NAME_REGEX;
import static org.sagebionetworks.web.client.ServiceEntryPointUtils.fixServiceEntryPoint;
import static org.sagebionetworks.web.shared.WebConstants.VALID_ENTITY_NAME_REGEX;

import com.google.common.util.concurrent.FutureCallback;
import com.google.gwt.core.client.JavaScriptObject;
Expand Down
5 changes: 4 additions & 1 deletion src/main/java/org/sagebionetworks/web/shared/asynch/AsynchType.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,8 @@
import static org.sagebionetworks.web.client.SynapseJavascriptClient.*;

import com.google.gwt.user.client.rpc.IsSerializable;
import org.sagebionetworks.repo.model.agent.AgentChatRequest;
import org.sagebionetworks.repo.model.agent.AgentChatResponse;
import org.sagebionetworks.repo.model.asynch.AsynchronousRequestBody;
import org.sagebionetworks.repo.model.asynch.AsynchronousResponseBody;
import org.sagebionetworks.repo.model.doi.v2.DoiRequest;
Expand Down Expand Up @@ -123,7 +125,8 @@ public enum AsynchType implements IsSerializable {
FILE_HANDLE_RESTORE,
FileHandleRestoreRequest.class,
FileHandleRestoreResponse.class
);
),
AgentChat(AGENT_CHAT, AgentChatRequest.class, AgentChatResponse.class);

String prefix;
Class<? extends AsynchronousRequestBody> requestClass;
Expand Down