This is an automated email from the ASF dual-hosted git repository. ykinash pushed a commit to branch DATALAB-2195 in repository https://gitbox.apache.org/repos/asf/incubator-datalab.git
commit cad9a87b5446da9cc97aed42dba61d59a7eb8114 Author: KinashYurii <[email protected]> AuthorDate: Tue Aug 3 10:12:04 2021 +0300 [DATALAB-2195] -- added recreate endpoint --- .../epam/datalab/backendapi/resources/dto/ProjectActionFormDTO.java | 3 +++ .../administration/project/project-list/project-list.component.html | 4 ++-- .../com/epam/datalab/backendapi/resources/ProjectResourceTest.java | 4 ++-- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/services/self-service/src/main/java/com/epam/datalab/backendapi/resources/dto/ProjectActionFormDTO.java b/services/self-service/src/main/java/com/epam/datalab/backendapi/resources/dto/ProjectActionFormDTO.java index 9f6e61e..4fc0b36 100644 --- a/services/self-service/src/main/java/com/epam/datalab/backendapi/resources/dto/ProjectActionFormDTO.java +++ b/services/self-service/src/main/java/com/epam/datalab/backendapi/resources/dto/ProjectActionFormDTO.java @@ -33,4 +33,7 @@ public class ProjectActionFormDTO { @NotNull @JsonProperty("endpoint") private final List<String> endpoints; + @NotNull + @JsonProperty("edge_status") + private final String edgeStatus; } diff --git a/services/self-service/src/main/resources/webapp/src/app/administration/project/project-list/project-list.component.html b/services/self-service/src/main/resources/webapp/src/app/administration/project/project-list/project-list.component.html index e407d30..1831faa 100644 --- a/services/self-service/src/main/resources/webapp/src/app/administration/project/project-list/project-list.component.html +++ b/services/self-service/src/main/resources/webapp/src/app/administration/project/project-list/project-list.component.html @@ -91,12 +91,12 @@ Stop edge node </a> </li> - <!-- <li class="project-seting-item " *ngIf="element.areTerminatedNode" (click)="openEdgeDialog('recreate', element)"> + <li class="project-seting-item " *ngIf="element.areTerminatedNode" (click)="openEdgeDialog('recreate', element)"> <i class="material-icons">refresh</i> <a class="action"> Recreate edge node </a> - </li> --> + </li> <li class="project-seting-item " *ngIf="element.areStoppedNode || element.areRunningNode" (click)="openEdgeDialog('terminate', element)"> <i class="material-icons">phonelink_off</i> <a class="action"> diff --git a/services/self-service/src/test/java/com/epam/datalab/backendapi/resources/ProjectResourceTest.java b/services/self-service/src/test/java/com/epam/datalab/backendapi/resources/ProjectResourceTest.java index 0dee149..96494c8 100644 --- a/services/self-service/src/test/java/com/epam/datalab/backendapi/resources/ProjectResourceTest.java +++ b/services/self-service/src/test/java/com/epam/datalab/backendapi/resources/ProjectResourceTest.java @@ -288,7 +288,7 @@ public class ProjectResourceTest extends TestBase { } private ProjectActionFormDTO getProjectActionDTO() { - return new ProjectActionFormDTO(PROJECT_NAME, Collections.singletonList(ENDPOINT_NAME)); + return new ProjectActionFormDTO(PROJECT_NAME, Collections.singletonList(ENDPOINT_NAME),"RUNNING"); } private UpdateProjectDTO prepareUpdateProjectDTO() { @@ -296,7 +296,7 @@ public class ProjectResourceTest extends TestBase { } private ProjectActionFormDTO prepareProjectActionFormDTO() { - return new ProjectActionFormDTO(PROJECT_NAME, Collections.singletonList(ENDPOINT_NAME)); + return new ProjectActionFormDTO(PROJECT_NAME, Collections.singletonList(ENDPOINT_NAME),"RUNNING"); } private List<UpdateProjectBudgetDTO> prepareUpdateProjectBudgetDTOs() { --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
