This is an automated email from the ASF dual-hosted git repository. dyankiv pushed a commit to branch DATALAB-2785 in repository https://gitbox.apache.org/repos/asf/incubator-datalab.git
commit 01496306bb7a574e4d23d50600ad0e7779c3f50e Merge: e6a9f09a4 ae8007f5d Author: Denys Yankiv <[email protected]> AuthorDate: Tue May 17 09:48:55 2022 +0300 resolve conflict .../src/general/lib/os/debian/notebook_lib.py | 8 ++++---- .../src/general/lib/os/fab.py | 3 +++ .../backendapi/resources/EnvironmentResource.java | 15 +++++++-------- .../dto/ExploratoryImageCreateFormAdminDTO.java | 22 ++++++++++++++++++++++ .../management/management.component.ts | 2 +- .../ami-create-dialog.component.ts | 4 ++-- 6 files changed, 39 insertions(+), 15 deletions(-) diff --cc services/self-service/src/main/java/com/epam/datalab/backendapi/resources/EnvironmentResource.java index 2fdfda448,9b984bb40..16fa7addc --- a/services/self-service/src/main/java/com/epam/datalab/backendapi/resources/EnvironmentResource.java +++ b/services/self-service/src/main/java/com/epam/datalab/backendapi/resources/EnvironmentResource.java @@@ -20,7 -20,6 +20,8 @@@ package com.epam.datalab.backendapi.resources; import com.epam.datalab.auth.UserInfo; ++import com.epam.datalab.backendapi.resources.dto.ExploratoryImageCreateFormAdminDTO; +import com.epam.datalab.backendapi.resources.dto.ExploratoryImageCreateFormDTO; import com.epam.datalab.backendapi.service.EnvironmentService; import com.google.inject.Inject; import io.dropwizard.auth.Auth; @@@ -124,19 -119,4 +125,17 @@@ public class EnvironmentResource environmentService.terminateComputational(userInfo, user, projectName, exploratoryName, computationalName); return Response.ok().build(); } + + @POST - @Consumes(MediaType.TEXT_PLAIN) ++ @Consumes(MediaType.APPLICATION_JSON) + @Produces(MediaType.APPLICATION_JSON) + @Path("createImage/{projectName}/{exploratoryName}") - public Response createImage(@Auth UserInfo userInfo, @NotEmpty String user, - @NotEmpty String imageName, - @NotEmpty String description, - @PathParam("projectName") String projectName, - @PathParam("exploratoryName") String exploratoryName, ++ public Response createImage(@Auth UserInfo userInfo, ++ @Valid @NotNull ExploratoryImageCreateFormAdminDTO form, + @Context UriInfo uriInfo) { - log.info("Admin {} is creating an image of exploratory {} of user {}", userInfo.getName(), exploratoryName, user); - environmentService.createImage(userInfo, user, projectName, exploratoryName, imageName, description); ++ log.info("Admin {} is creating an image of exploratory {} of user {}", userInfo.getName(), form.getNotebookName(), form.getUser()); ++ environmentService.createImage(userInfo, form.getUser(), form.getProjectName(), form.getNotebookName(), form.getName(), form.getDescription()); + return Response.ok().build(); + } ++ } diff --cc services/self-service/src/main/java/com/epam/datalab/backendapi/resources/dto/ExploratoryImageCreateFormAdminDTO.java index 000000000,000000000..69498d362 new file mode 100644 --- /dev/null +++ b/services/self-service/src/main/java/com/epam/datalab/backendapi/resources/dto/ExploratoryImageCreateFormAdminDTO.java @@@ -1,0 -1,0 +1,22 @@@ ++package com.epam.datalab.backendapi.resources.dto; ++ ++import com.fasterxml.jackson.annotation.JsonProperty; ++import lombok.Data; ++import lombok.ToString; ++import org.hibernate.validator.constraints.NotBlank; ++ ++@Data ++@ToString ++public class ExploratoryImageCreateFormAdminDTO { ++ @NotBlank ++ private String user; ++ @NotBlank ++ private final String name; ++ @NotBlank ++ @JsonProperty("exploratory_name") ++ private String notebookName; ++ @NotBlank ++ @JsonProperty("project_name") ++ private String projectName; ++ private final String description; ++} --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
