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 c6cda9e1 Small fixes
c6cda9e1 is described below
commit c6cda9e1559468c79836f71a9adf8c8d62e80596
Author: Marat Gubaidullin <[email protected]>
AuthorDate: Mon Jun 10 10:10:58 2024 -0400
Small fixes
---
.../java/org/apache/camel/karavan/KaravanCache.java | 16 ++++++++--------
.../org/apache/camel/karavan/KaravanConstants.java | 2 +-
.../apache/camel/karavan/KaravanStartupLoader.java | 4 ++--
.../apache/camel/karavan/service/CodeService.java | 10 +++++++---
.../apache/camel/karavan/service/ProjectService.java | 4 ++--
.../src/main/webui/src/project/ProjectPage.tsx | 7 +++++--
.../webui/src/project/container/ContainerButtons.tsx | 1 -
.../webui/src/project/container/ContainerPanel.tsx | 2 --
.../src/project/trace/RunnerInfoTraceMessage.tsx | 20 +++-----------------
9 files changed, 28 insertions(+), 38 deletions(-)
diff --git
a/karavan-app/src/main/java/org/apache/camel/karavan/KaravanCache.java
b/karavan-app/src/main/java/org/apache/camel/karavan/KaravanCache.java
index fae5d6d8..4b0e21a1 100644
--- a/karavan-app/src/main/java/org/apache/camel/karavan/KaravanCache.java
+++ b/karavan-app/src/main/java/org/apache/camel/karavan/KaravanCache.java
@@ -28,7 +28,7 @@ import java.util.Objects;
import java.util.concurrent.ConcurrentHashMap;
import java.util.stream.Collectors;
-import static org.apache.camel.karavan.KaravanConstants.DEFAULT_ENVIRONMENT;
+import static org.apache.camel.karavan.KaravanConstants.DEV_ENVIRONMENT;
@Default
@Singleton
@@ -86,7 +86,7 @@ public class KaravanCache {
}
public void saveProject(Project project) {
- var key = GroupedKey.create(project.getProjectId(),
DEFAULT_ENVIRONMENT, project.getProjectId());
+ var key = GroupedKey.create(project.getProjectId(), DEV_ENVIRONMENT,
project.getProjectId());
projects.put(key, project);
}
@@ -109,9 +109,9 @@ public class KaravanCache {
}
public void saveProjectFile(ProjectFile file, boolean commited) {
- files.put(GroupedKey.create(file.getProjectId(), DEFAULT_ENVIRONMENT,
file.getName()), file);
+ files.put(GroupedKey.create(file.getProjectId(), DEV_ENVIRONMENT,
file.getName()), file);
if (commited) {
- filesCommited.put(GroupedKey.create(file.getProjectId(),
DEFAULT_ENVIRONMENT, file.getName()), file);
+ filesCommited.put(GroupedKey.create(file.getProjectId(),
DEV_ENVIRONMENT, file.getName()), file);
}
}
@@ -134,7 +134,7 @@ public class KaravanCache {
}
public void deleteProjectFile(String projectId, String filename) {
- files.remove(GroupedKey.create(projectId, DEFAULT_ENVIRONMENT,
filename));
+ files.remove(GroupedKey.create(projectId, DEV_ENVIRONMENT, filename));
}
public List<ProjectFile> getProjectFilesCommited(String projectId) {
@@ -147,15 +147,15 @@ public class KaravanCache {
}
public void deleteProjectFileCommited(String projectId, String filename) {
- filesCommited.remove(GroupedKey.create(projectId, DEFAULT_ENVIRONMENT,
filename));
+ filesCommited.remove(GroupedKey.create(projectId, DEV_ENVIRONMENT,
filename));
}
public void deleteProject(String projectId) {
- projects.remove(GroupedKey.create(projectId, DEFAULT_ENVIRONMENT,
projectId));
+ projects.remove(GroupedKey.create(projectId, DEV_ENVIRONMENT,
projectId));
}
public Project getProject(String projectId) {
- return projects.get(GroupedKey.create(projectId, DEFAULT_ENVIRONMENT,
projectId));
+ return projects.get(GroupedKey.create(projectId, DEV_ENVIRONMENT,
projectId));
}
public DeploymentStatus getDeploymentStatus(String projectId, String
environment) {
diff --git
a/karavan-app/src/main/java/org/apache/camel/karavan/KaravanConstants.java
b/karavan-app/src/main/java/org/apache/camel/karavan/KaravanConstants.java
index c9666b23..cf0de596 100644
--- a/karavan-app/src/main/java/org/apache/camel/karavan/KaravanConstants.java
+++ b/karavan-app/src/main/java/org/apache/camel/karavan/KaravanConstants.java
@@ -18,7 +18,7 @@ package org.apache.camel.karavan;
public class KaravanConstants {
- public static final String DEFAULT_ENVIRONMENT = "dev";
+ public static final String DEV_ENVIRONMENT = "dev";
public static final String ENV_VAR_JBANG_OPTIONS = "JBANG_OPTIONS";
public static final String LABEL_PART_OF = "app.kubernetes.io/part-of";
diff --git
a/karavan-app/src/main/java/org/apache/camel/karavan/KaravanStartupLoader.java
b/karavan-app/src/main/java/org/apache/camel/karavan/KaravanStartupLoader.java
index 600a781d..25dc8a46 100644
---
a/karavan-app/src/main/java/org/apache/camel/karavan/KaravanStartupLoader.java
+++
b/karavan-app/src/main/java/org/apache/camel/karavan/KaravanStartupLoader.java
@@ -42,7 +42,7 @@ import java.util.List;
import java.util.Objects;
import java.util.concurrent.atomic.AtomicBoolean;
-import static org.apache.camel.karavan.KaravanConstants.DEFAULT_ENVIRONMENT;
+import static org.apache.camel.karavan.KaravanConstants.DEV_ENVIRONMENT;
import static org.apache.camel.karavan.KaravanEvents.PROJECTS_STARTED;
@Default
@@ -102,7 +102,7 @@ public class KaravanStartupLoader implements HealthCheck {
if (karavanCache.getProjects().isEmpty()) {
importAllProjects();
}
- if (Objects.equals(environment, DEFAULT_ENVIRONMENT)) {
+ if (Objects.equals(environment, DEV_ENVIRONMENT)) {
addKameletsProject();
addTemplatesProject();
addServicesProject();
diff --git
a/karavan-app/src/main/java/org/apache/camel/karavan/service/CodeService.java
b/karavan-app/src/main/java/org/apache/camel/karavan/service/CodeService.java
index 8a8f7ba7..52ed09a0 100644
---
a/karavan-app/src/main/java/org/apache/camel/karavan/service/CodeService.java
+++
b/karavan-app/src/main/java/org/apache/camel/karavan/service/CodeService.java
@@ -41,6 +41,8 @@ import java.time.Instant;
import java.util.*;
import java.util.stream.Collectors;
+import static org.apache.camel.karavan.KaravanConstants.DEV_ENVIRONMENT;
+
@ApplicationScoped
public class CodeService {
@@ -285,15 +287,17 @@ public class CodeService {
return getProjectPort(composeFile);
}
-
public DockerComposeService getDockerComposeService(String projectId) {
- ProjectFile compose = karavanCache.getProjectFile(projectId,
PROJECT_COMPOSE_FILENAME);
+ String composeFileName = PROJECT_COMPOSE_FILENAME;
+ if (!Objects.equals(environment, DEV_ENVIRONMENT)) {
+ composeFileName = environment + "." + PROJECT_COMPOSE_FILENAME;
+ }
+ ProjectFile compose = karavanCache.getProjectFile(projectId,
composeFileName);
if (compose != null) {
return DockerComposeConverter.fromCode(compose.getCode(),
projectId);
}
return null;
}
-
public void updateDockerComposeImage(String projectId, String imageName) {
ProjectFile compose = karavanCache.getProjectFile(projectId,
PROJECT_COMPOSE_FILENAME);
if (compose != null) {
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 52aa61a1..f718cbf0 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
@@ -36,7 +36,7 @@ import java.time.Instant;
import java.util.*;
import java.util.stream.Collectors;
-import static org.apache.camel.karavan.KaravanConstants.DEFAULT_ENVIRONMENT;
+import static org.apache.camel.karavan.KaravanConstants.DEV_ENVIRONMENT;
import static org.apache.camel.karavan.KaravanEvents.*;
import static org.apache.camel.karavan.service.CodeService.*;
@@ -268,7 +268,7 @@ public class ProjectService {
!Objects.equals(e.getValue().getName(),
PROJECT_DEPLOYMENT_JKUBE_FILENAME)
)
.collect(Collectors.toMap(
- e -> GroupedKey.create(project.getProjectId(),
DEFAULT_ENVIRONMENT, e.getValue().getName()),
+ e -> GroupedKey.create(project.getProjectId(),
DEV_ENVIRONMENT, e.getValue().getName()),
e -> {
ProjectFile file = e.getValue();
file.setProjectId(project.getProjectId());
diff --git a/karavan-app/src/main/webui/src/project/ProjectPage.tsx
b/karavan-app/src/main/webui/src/project/ProjectPage.tsx
index cb7c6f44..f07e6b8c 100644
--- a/karavan-app/src/main/webui/src/project/ProjectPage.tsx
+++ b/karavan-app/src/main/webui/src/project/ProjectPage.tsx
@@ -83,7 +83,10 @@ export function ProjectPage() {
const ephemeral = project.type === ProjectType.ephemeral
const showFilePanel = file !== undefined && operation === 'select';
- const containerTabName = config.infrastructure === 'kubernetes' ? "Pods" :
"Containers"
+ const isKubernetes = config.infrastructure === 'kubernetes'
+ const containerTabName = isKubernetes ? "Pods" : "Containers"
+ const isDevEnvironment = config.environment === 'dev';
+ const showBuildTab = isKubernetes || isDevEnvironment;
return (
<PageSection className="project-page" padding={{default: 'noPadding'}}>
<PageSection className="tools-section" padding={{default:
'noPadding'}}>
@@ -100,7 +103,7 @@ export function ProjectPage() {
<Tab eventKey="files" title="Files"/>
{!ephemeral && <Tab eventKey="dashboard"
title="Dashboard"/>}
{!ephemeral && <Tab eventKey="trace"
title="Trace"/>}
- {!ephemeral && <Tab eventKey="build"
title="Build"/>}
+ {!ephemeral && showBuildTab && <Tab
eventKey="build" title="Build"/>}
<Tab eventKey="container"
title={containerTabName}/>
{hasReadme() && <Tab eventKey="readme"
title="Readme"/>}
</Tabs>
diff --git
a/karavan-app/src/main/webui/src/project/container/ContainerButtons.tsx
b/karavan-app/src/main/webui/src/project/container/ContainerButtons.tsx
index 4b33f64a..50f05d39 100644
--- a/karavan-app/src/main/webui/src/project/container/ContainerButtons.tsx
+++ b/karavan-app/src/main/webui/src/project/container/ContainerButtons.tsx
@@ -45,7 +45,6 @@ export function ContainerButtons (props: Props) {
const containerStatus = containers.filter(c => c.containerName ===
project.projectId).at(0);
const commands = containerStatus?.commands || ['deploy'];
- const exists = containerStatus != undefined;
const isRunning = containerStatus?.state === 'running';
const inTransit = containerStatus?.inTransit;
const isLoading = status === 'wip';
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 cdb3af4e..9c8846ff 100644
--- a/karavan-app/src/main/webui/src/project/container/ContainerPanel.tsx
+++ b/karavan-app/src/main/webui/src/project/container/ContainerPanel.tsx
@@ -35,10 +35,8 @@ import {ContainerStatus} from "../../api/ProjectModels";
import {ContainerButtons} from "./ContainerButtons";
import DeleteIcon from
"@patternfly/react-icons/dist/esm/icons/times-circle-icon";
import ImageIcon from "@patternfly/react-icons/dist/esm/icons/cube-icon";
-import CommitIcon from
"@patternfly/react-icons/dist/esm/icons/code-branch-icon";
import {KaravanApi} from "../../api/KaravanApi";
import {EventBus} from "../../designer/utils/EventBus";
-import {getShortCommit} from "../../util/StringUtils";
interface Props {
env: string,
diff --git
a/karavan-app/src/main/webui/src/project/trace/RunnerInfoTraceMessage.tsx
b/karavan-app/src/main/webui/src/project/trace/RunnerInfoTraceMessage.tsx
index 1e699374..8dbead17 100644
--- a/karavan-app/src/main/webui/src/project/trace/RunnerInfoTraceMessage.tsx
+++ b/karavan-app/src/main/webui/src/project/trace/RunnerInfoTraceMessage.tsx
@@ -14,24 +14,11 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-import React, {useEffect, useState} from 'react';
+import React, {useState} from 'react';
import {
CodeBlock,
- CodeBlockCode,
- DataList,
- DataListCell,
- DataListItem,
- DataListItemCells,
- DataListItemRow,
- DataListWrapModifier,
- DescriptionList,
- DescriptionListDescription,
- DescriptionListGroup,
- DescriptionListTerm, Flex,
- Panel,
- PanelHeader,
- PanelMain,
- PanelMainBody, Tab,
+ CodeBlockCode, Flex,
+ Tab,
Tabs, TabTitleText, Text, TextContent, TextVariants
} from '@patternfly/react-core';
import '../../designer/karavan.css';
@@ -47,7 +34,6 @@ export function RunnerInfoTraceMessage (props: Props) {
const [variableName, setVariableName] = useState<string | number>();
const message = props.trace?.message;
- const type = message?.body?.type;
const headers: any[] = message?.headers ? [...message?.headers] : [];
const properties: any[] = message?.exchangeProperties ?
[...message?.exchangeProperties] : [];
const variables: any[] = message?.exchangeVariables ?
[...message?.exchangeVariables] : [];
