This is an automated email from the ASF dual-hosted git repository.
marat pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel-karavan.git
The following commit(s) were added to refs/heads/main by this push:
new f7c7245d Small fixes
f7c7245d is described below
commit f7c7245df63e343ee30b1e880e97d541910d060d
Author: Marat Gubaidullin <[email protected]>
AuthorDate: Mon Jun 10 10:16:23 2024 -0400
Small fixes
---
.../apache/camel/karavan/service/ProjectService.java | 20 ++++++++++++--------
.../webui/src/project/container/ContainerPanel.tsx | 2 +-
2 files changed, 13 insertions(+), 9 deletions(-)
diff --git
a/karavan-app/src/main/java/org/apache/camel/karavan/service/ProjectService.java
b/karavan-app/src/main/java/org/apache/camel/karavan/service/ProjectService.java
index f718cbf0..bc42e4ca 100644
---
a/karavan-app/src/main/java/org/apache/camel/karavan/service/ProjectService.java
+++
b/karavan-app/src/main/java/org/apache/camel/karavan/service/ProjectService.java
@@ -314,14 +314,18 @@ public class ProjectService {
}
private int getMaxPortMappedInProjects() {
- List<ProjectFile> files =
karavanCache.getProjectFilesByName(PROJECT_COMPOSE_FILENAME).stream()
- .filter(f -> !Objects.equals(f.getProjectId(),
Project.Type.templates.name())).toList();
- if (!files.isEmpty()) {
- return files.stream().map(this::getProjectPort)
- .filter(Objects::nonNull)
- .mapToInt(Integer::intValue)
- .max().orElse(INTERNAL_PORT);
- } else {
+ try {
+ List<ProjectFile> files =
karavanCache.getProjectFilesByName(PROJECT_COMPOSE_FILENAME).stream()
+ .filter(f -> !Objects.equals(f.getProjectId(),
Project.Type.templates.name())).toList();
+ if (!files.isEmpty()) {
+ return files.stream().map(this::getProjectPort)
+ .filter(Objects::nonNull)
+ .mapToInt(Integer::intValue)
+ .max().orElse(INTERNAL_PORT);
+ } else {
+ return INTERNAL_PORT;
+ }
+ } catch (Exception e) {
return INTERNAL_PORT;
}
}
diff --git
a/karavan-app/src/main/webui/src/project/container/ContainerPanel.tsx
b/karavan-app/src/main/webui/src/project/container/ContainerPanel.tsx
index 9c8846ff..cf3a6f7c 100644
--- a/karavan-app/src/main/webui/src/project/container/ContainerPanel.tsx
+++ b/karavan-app/src/main/webui/src/project/container/ContainerPanel.tsx
@@ -89,7 +89,7 @@ export function ContainerPanel(props: Props) {
const env = props.env;
const conts = containers
- .filter(c => c.env == env)
+ .filter(c => c.env === env)
.filter(d => d.projectId === project?.projectId && d.type ===
'project');
return (
<Flex justifyContent={{default: "justifyContentSpaceBetween"}}