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 086916ae Remove unused ephemeral projects code
086916ae is described below
commit 086916ae8e741d6dfdbfeb245cf08c77fdb9cbbe
Author: Marat Gubaidullin <[email protected]>
AuthorDate: Mon Jul 15 17:09:08 2024 -0400
Remove unused ephemeral projects code
---
.../src/main/java/org/apache/camel/karavan/model/Project.java | 1 -
karavan-app/src/main/webui/src/api/ProjectModels.ts | 1 -
karavan-app/src/main/webui/src/project/ProjectPage.tsx | 9 ++++-----
karavan-app/src/main/webui/src/projects/ProjectsPage.tsx | 2 +-
karavan-app/src/main/webui/src/resources/ResourcesPage.tsx | 2 +-
5 files changed, 6 insertions(+), 9 deletions(-)
diff --git
a/karavan-app/src/main/java/org/apache/camel/karavan/model/Project.java
b/karavan-app/src/main/java/org/apache/camel/karavan/model/Project.java
index c5a67c4e..3821a0c5 100644
--- a/karavan-app/src/main/java/org/apache/camel/karavan/model/Project.java
+++ b/karavan-app/src/main/java/org/apache/camel/karavan/model/Project.java
@@ -29,7 +29,6 @@ public class Project {
kamelets,
configuration,
normal,
- ephemeral,
}
String projectId;
diff --git a/karavan-app/src/main/webui/src/api/ProjectModels.ts
b/karavan-app/src/main/webui/src/api/ProjectModels.ts
index 7431521e..f6b41e49 100644
--- a/karavan-app/src/main/webui/src/api/ProjectModels.ts
+++ b/karavan-app/src/main/webui/src/api/ProjectModels.ts
@@ -31,7 +31,6 @@ export enum ProjectType {
kamelets ='kamelets',
configuration ='configuration',
normal ='normal',
- ephemeral ='ephemeral',
}
export const BUILD_IN_PROJECTS: string[] = [ProjectType.kamelets.toString(),
ProjectType.templates.toString(), ProjectType.configuration.toString()];
diff --git a/karavan-app/src/main/webui/src/project/ProjectPage.tsx
b/karavan-app/src/main/webui/src/project/ProjectPage.tsx
index 03bdecd7..46795370 100644
--- a/karavan-app/src/main/webui/src/project/ProjectPage.tsx
+++ b/karavan-app/src/main/webui/src/project/ProjectPage.tsx
@@ -81,7 +81,6 @@ export function ProjectPage() {
return files.map(f => f.name).findIndex(f => f.toLowerCase() ===
'readme.md') !== -1;
}
- const ephemeral = project.type === ProjectType.ephemeral
const showFilePanel = file !== undefined && operation === 'select';
const isKubernetes = config.infrastructure === 'kubernetes'
const containerTabName = isKubernetes ? "Pods" : "Containers"
@@ -99,11 +98,11 @@ export function ProjectPage() {
<Tabs activeKey={tabIndex} onSelect={(event,
tabIndex) => {
setTabIndex(tabIndex);
}}>
- {!ephemeral && <Tab eventKey="topology"
title="Topology"/>}
+ {<Tab eventKey="topology" title="Topology"/>}
<Tab eventKey="files" title="Files"/>
- {!ephemeral && <Tab eventKey="dashboard"
title="Dashboard"/>}
- {!ephemeral && <Tab eventKey="trace"
title="Trace"/>}
- {!ephemeral && showBuildTab && <Tab
eventKey="build" title="Build"/>}
+ {<Tab eventKey="dashboard" title="Dashboard"/>}
+ {<Tab eventKey="trace" title="Trace"/>}
+ {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/projects/ProjectsPage.tsx
b/karavan-app/src/main/webui/src/projects/ProjectsPage.tsx
index b9c23549..33b2a74b 100644
--- a/karavan-app/src/main/webui/src/projects/ProjectsPage.tsx
+++ b/karavan-app/src/main/webui/src/projects/ProjectsPage.tsx
@@ -88,7 +88,7 @@ export function ProjectsPage (props: Props) {
function getProjectsTable() {
const projs = projects
- .filter(p => p.type === ProjectType.normal || p.type ===
ProjectType.ephemeral)
+ .filter(p => p.type === ProjectType.normal)
.filter(p => p.name.toLowerCase().includes(filter));
return (
<Table aria-label="Projects" variant={"compact"}>
diff --git a/karavan-app/src/main/webui/src/resources/ResourcesPage.tsx
b/karavan-app/src/main/webui/src/resources/ResourcesPage.tsx
index 65dfd0c3..5ce53cc8 100644
--- a/karavan-app/src/main/webui/src/resources/ResourcesPage.tsx
+++ b/karavan-app/src/main/webui/src/resources/ResourcesPage.tsx
@@ -89,7 +89,7 @@ export function ResourcesPage () {
function getProjectsTable() {
const projs = projects
- .filter(p => p.type !== ProjectType.normal && p.type !==
ProjectType.ephemeral)
+ .filter(p => p.type !== ProjectType.normal)
.filter(p => p.name.toLowerCase().includes(filter));
return (
<Table aria-label="Templates" variant={"compact"}>
