This is an automated email from the ASF dual-hosted git repository.
dyankiv pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/incubator-datalab.git
The following commit(s) were added to refs/heads/develop by this push:
new 000ff730b filter by endpoint instead of cloud, make image name filter
case insensitive
000ff730b is described below
commit 000ff730b1204685051ea760a451b542efc6fe0b
Author: Denys Yankiv <[email protected]>
AuthorDate: Mon Aug 1 14:28:05 2022 +0300
filter by endpoint instead of cloud, make image name filter case insensitive
---
.../java/com/epam/datalab/backendapi/resources/dto/ImageFilter.java | 4 +---
.../datalab/backendapi/service/impl/ImageExploratoryServiceImpl.java | 4 ++--
2 files changed, 3 insertions(+), 5 deletions(-)
diff --git
a/services/self-service/src/main/java/com/epam/datalab/backendapi/resources/dto/ImageFilter.java
b/services/self-service/src/main/java/com/epam/datalab/backendapi/resources/dto/ImageFilter.java
index 81585ffc8..2d924b4da 100644
---
a/services/self-service/src/main/java/com/epam/datalab/backendapi/resources/dto/ImageFilter.java
+++
b/services/self-service/src/main/java/com/epam/datalab/backendapi/resources/dto/ImageFilter.java
@@ -19,11 +19,9 @@
package com.epam.datalab.backendapi.resources.dto;
-import com.epam.datalab.cloud.CloudProvider;
import com.epam.datalab.dto.exploratory.ImageSharingStatus;
import com.epam.datalab.dto.exploratory.ImageStatus;
import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
-import com.fasterxml.jackson.annotation.JsonProperty;
import lombok.Data;
import lombok.NoArgsConstructor;
import lombok.NonNull;
@@ -39,7 +37,7 @@ public class ImageFilter {
@NonNull
private List<ImageStatus> statuses;
@NonNull
- private List<CloudProvider> cloudProviders;
+ private List<String> endpoints;
@NonNull
private List<String> templateNames;
@NonNull
diff --git
a/services/self-service/src/main/java/com/epam/datalab/backendapi/service/impl/ImageExploratoryServiceImpl.java
b/services/self-service/src/main/java/com/epam/datalab/backendapi/service/impl/ImageExploratoryServiceImpl.java
index fd63d28d2..0a1146722 100644
---
a/services/self-service/src/main/java/com/epam/datalab/backendapi/service/impl/ImageExploratoryServiceImpl.java
+++
b/services/self-service/src/main/java/com/epam/datalab/backendapi/service/impl/ImageExploratoryServiceImpl.java
@@ -349,9 +349,9 @@ public class ImageExploratoryServiceImpl implements
ImageExploratoryService {
private List<ImageInfoRecord> filterImages(List<ImageInfoRecord> images,
ImageFilter filter){
return images.stream()
- .filter(img -> img.getName().contains(filter.getImageName()))
+ .filter(img ->
img.getName().toLowerCase().contains(filter.getImageName().toLowerCase()))
.filter(img -> CollectionUtils.isEmpty(filter.getStatuses())
|| filter.getStatuses().contains(img.getStatus()))
- .filter(img ->
CollectionUtils.isEmpty(filter.getCloudProviders()) ||
filter.getCloudProviders().contains(img.getCloudProvider()))
+ .filter(img -> CollectionUtils.isEmpty(filter.getEndpoints())
|| filter.getEndpoints().contains(img.getEndpoint()))
.filter(img ->
CollectionUtils.isEmpty(filter.getTemplateNames()) ||
filter.getTemplateNames().contains(img.getTemplateName()))
.filter(img ->
CollectionUtils.isEmpty(filter.getSharingStatuses()) ||
filter.getSharingStatuses().contains(img.getSharingStatus()))
.collect(Collectors.toList());
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
