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 d7f3f5b7 Buttons class
d7f3f5b7 is described below
commit d7f3f5b70dd74b0675eb5f6118af8d1b8f946577
Author: Marat Gubaidullin <ma...@talismancloud.io>
AuthorDate: Wed Jan 24 16:50:33 2024 -0500
Buttons class
---
.../resources/snippets/kubernetes-builder-env.properties | 8 ++++++++
.../src/main/webui/src/config/ConfigurationPage.tsx | 2 +-
.../src/main/webui/src/containers/ContainerTableRow.tsx | 8 ++++----
.../karavan-app/src/main/webui/src/project/BuildToolbar.tsx | 4 ++--
.../src/main/webui/src/project/DevModeToolbar.tsx | 11 +++++------
.../src/main/webui/src/project/builder/BuildPanel.tsx | 4 ++--
.../main/webui/src/project/container/ContainerButtons.tsx | 8 ++++----
.../src/main/webui/src/project/container/ContainerPanel.tsx | 2 +-
.../src/main/webui/src/project/container/DeploymentPanel.tsx | 2 +-
.../src/main/webui/src/project/files/FilesTab.tsx | 4 ++--
.../src/main/webui/src/project/files/FilesToolbar.tsx | 12 ++++++------
.../src/main/webui/src/project/trace/TraceTable.tsx | 2 +-
.../karavan-app/src/main/webui/src/projects/ProjectsPage.tsx | 3 ++-
.../src/main/webui/src/projects/ProjectsTableRow.tsx | 4 ++--
.../karavan-app/src/main/webui/src/services/ServicesPage.tsx | 2 +-
.../src/main/webui/src/topology/TopologyToolbar.tsx | 6 +++---
16 files changed, 45 insertions(+), 37 deletions(-)
diff --git
a/karavan-web/karavan-app/src/main/resources/snippets/kubernetes-builder-env.properties
b/karavan-web/karavan-app/src/main/resources/snippets/kubernetes-builder-env.properties
new file mode 100644
index 00000000..5c11b05d
--- /dev/null
+++
b/karavan-web/karavan-app/src/main/resources/snippets/kubernetes-builder-env.properties
@@ -0,0 +1,8 @@
+IMAGE_REGISTRY=karavan:image-registry
+IMAGE_REGISTRY_USERNAME=karavan:image-registry-username
+IMAGE_REGISTRY_PASSWORD=karavan:image-password
+IMAGE_GROUP=karavan:image-group
+GIT_REPOSITORY=karavan:git-repository
+GIT_USERNAME=karavan:git-username
+GIT_PASSWORD=karavan:git-password
+GIT_BRANCH=karavan:git-branch
\ No newline at end of file
diff --git
a/karavan-web/karavan-app/src/main/webui/src/config/ConfigurationPage.tsx
b/karavan-web/karavan-app/src/main/webui/src/config/ConfigurationPage.tsx
index aa24a233..80fd439b 100644
--- a/karavan-web/karavan-app/src/main/webui/src/config/ConfigurationPage.tsx
+++ b/karavan-web/karavan-app/src/main/webui/src/config/ConfigurationPage.tsx
@@ -41,7 +41,7 @@ export const ConfigurationPage = (props: Props) => {
return (<Toolbar id="toolbar-group-types">
<ToolbarContent>
{tab === 'statuses' && <ToolbarItem>
- <Button onClick={event => {
+ <Button className="dev-action-button" onClick={event => {
KaravanApi.deleteAllStatuses(res => {
if (res.status === 200) {
EventBus.sendAlert('Success', 'Statuses
deleted', "info");
diff --git
a/karavan-web/karavan-app/src/main/webui/src/containers/ContainerTableRow.tsx
b/karavan-web/karavan-app/src/main/webui/src/containers/ContainerTableRow.tsx
index 0e43e5f8..d691cd81 100644
---
a/karavan-web/karavan-app/src/main/webui/src/containers/ContainerTableRow.tsx
+++
b/karavan-web/karavan-app/src/main/webui/src/containers/ContainerTableRow.tsx
@@ -119,7 +119,7 @@ export function ContainerTableRow(props: Props) {
spaceItems={{default: 'spaceItemsNone'}}>
<FlexItem>
<Tooltip content={"Start container"}
position={"bottom"}>
- <Button variant={"plain"}
icon={<PlayIcon/>}
+ <Button className="dev-action-button"
variant={"plain"} icon={<PlayIcon/>}
isDisabled={!commands.includes('run') || inTransit}
onClick={e => {
setCommand('run');
@@ -129,7 +129,7 @@ export function ContainerTableRow(props: Props) {
</FlexItem>
<FlexItem>
<Tooltip content={"Pause container"}
position={"bottom"}>
- <Button variant={"plain"}
icon={<PauseIcon/>}
+ <Button className="dev-action-button"
variant={"plain"} icon={<PauseIcon/>}
isDisabled={!commands.includes('pause') || inTransit}
onClick={e => {
setCommand('pause');
@@ -139,7 +139,7 @@ export function ContainerTableRow(props: Props) {
</FlexItem>
<FlexItem>
<Tooltip content={"Stop container"}
position={"bottom"}>
- <Button variant={"plain"}
icon={<StopIcon/>}
+ <Button className="dev-action-button"
variant={"plain"} icon={<StopIcon/>}
isDisabled={!commands.includes('stop') || inTransit}
onClick={e => {
setCommand('stop');
@@ -149,7 +149,7 @@ export function ContainerTableRow(props: Props) {
</FlexItem>
<FlexItem>
<Tooltip content={"Delete container"}
position={"bottom"}>
- <Button variant={"plain"}
icon={<DeleteIcon/>}
+ <Button className="dev-action-button"
variant={"plain"} icon={<DeleteIcon/>}
isDisabled={!commands.includes('delete') || inTransit}
onClick={e => {
setCommand('delete');
diff --git
a/karavan-web/karavan-app/src/main/webui/src/project/BuildToolbar.tsx
b/karavan-web/karavan-app/src/main/webui/src/project/BuildToolbar.tsx
index fff30c17..eb2dfb10 100644
--- a/karavan-web/karavan-app/src/main/webui/src/project/BuildToolbar.tsx
+++ b/karavan-web/karavan-app/src/main/webui/src/project/BuildToolbar.tsx
@@ -45,13 +45,13 @@ export function BuildToolbar (props: Props) {
return (<Flex className="toolbar" direction={{default: "row"}}
alignItems={{default: "alignItemsCenter"}}>
<FlexItem>
- <Button style={{visibility:"hidden"}} size="sm"
variant={"control"} icon={<DeleteIcon/>} onClick={() => {}}>
+ <Button className="dev-action-button"
style={{visibility:"hidden"}} size="sm" variant={"control"}
icon={<DeleteIcon/>} onClick={() => {}}>
</Button>
</FlexItem>
{containerStatus?.containerId && <FlexItem>
<Label icon={icon} color={color}>
<Tooltip content={"Show log"}
position={TooltipPosition.bottom}>
- <Button className='labeled-button' variant="link"
isDisabled={!isRunning}
+ <Button className="dev-action-button labeled-button"
variant="link" isDisabled={!isRunning}
onClick={e =>
setShowLog( true, 'container',
containerStatus.containerName)}>
{containerStatus.containerName}
diff --git
a/karavan-web/karavan-app/src/main/webui/src/project/DevModeToolbar.tsx
b/karavan-web/karavan-app/src/main/webui/src/project/DevModeToolbar.tsx
index bcb46dc4..af580439 100644
--- a/karavan-web/karavan-app/src/main/webui/src/project/DevModeToolbar.tsx
+++ b/karavan-web/karavan-app/src/main/webui/src/project/DevModeToolbar.tsx
@@ -81,7 +81,7 @@ export function DevModeToolbar(props: Props) {
<FlexItem className="refresher">
{poll && <Spinner className="spinner" size="lg"
aria-label="Refresh"/>}
<Tooltip content={poll ? "Stop refresh" : "Refresh auto"}
position={TooltipPosition.bottom}>
- <Button className="button"
+ <Button className="dev-action-button button"
icon={poll ? <StopIcon/> : <RefreshIcon/>}
variant={"link"}
onClick={e => setPoll(!poll)}/>
@@ -96,7 +96,7 @@ export function DevModeToolbar(props: Props) {
{containerStatus?.containerId && <FlexItem>
<Label icon={icon} color={color}>
<Tooltip content={"Show log"}
position={TooltipPosition.bottom}>
- <Button className='labeled-button' variant="link"
isDisabled={!isRunning}
+ <Button className='dev-action-button labeled-button'
variant="link" isDisabled={!isRunning}
onClick={e =>
setShowLog(true, 'container',
containerStatus.containerName)}>
{containerStatus.containerName}
@@ -116,7 +116,7 @@ export function DevModeToolbar(props: Props) {
</FlexItem>}
{!isRunning && <FlexItem>
<Tooltip content="Run in developer mode"
position={TooltipPosition.bottomEnd}>
- <Button size="sm"
+ <Button className="dev-action-button" size="sm"
isDisabled={(!(commands.length === 0) &&
!commands.includes('run')) || inTransit}
variant={"primary"}
icon={<RocketIcon/>}
@@ -130,10 +130,9 @@ export function DevModeToolbar(props: Props) {
</FlexItem>}
{isRunning && inDevMode && <FlexItem>
<Tooltip content="Reload" position={TooltipPosition.bottomEnd}>
- <Button size="sm"
+ <Button className="project-button dev-action-button" size="sm"
isDisabled={inTransit}
variant={"primary"}
- className="project-button"
icon={<ReloadIcon/>}
onClick={() =>
ProjectService.reloadDevModeCode(project)}>Reload
</Button>
@@ -141,7 +140,7 @@ export function DevModeToolbar(props: Props) {
</FlexItem>}
{inDevMode && <FlexItem>
<Tooltip content="Delete container"
position={TooltipPosition.bottomEnd}>
- <Button size="sm"
+ <Button className="dev-action-button" size="sm"
isDisabled={!commands.includes('delete') || inTransit}
variant={"control"}
icon={<DeleteIcon/>}
diff --git
a/karavan-web/karavan-app/src/main/webui/src/project/builder/BuildPanel.tsx
b/karavan-web/karavan-app/src/main/webui/src/project/builder/BuildPanel.tsx
index 0fa657f6..d52df624 100644
--- a/karavan-web/karavan-app/src/main/webui/src/project/builder/BuildPanel.tsx
+++ b/karavan-web/karavan-app/src/main/webui/src/project/builder/BuildPanel.tsx
@@ -82,7 +82,7 @@ export function BuildPanel () {
isDisabled={isBuilding || isRunning || isPushing}
size="sm"
variant="secondary"
- className="project-button"
+ className="project-button dev-action-button"
icon={!isBuilding ? <BuildIcon/> : <div></div>}
onClick={e => build()}>
{isBuilding ? "..." : "Build"}
@@ -122,7 +122,7 @@ export function BuildPanel () {
<Label icon={isRunning ? <Spinner diameter="16px"
className="spinner"/> : icon}
color={color}>
{buildName
- ? <Button className='labeled-button'
variant="link" onClick={e =>
+ ? <Button className='labeled-button
dev-action-button' variant="link" onClick={e =>
useLogStore.setState({showLog: true, type:
'build', podName: buildName})
}>
{buildName}
diff --git
a/karavan-web/karavan-app/src/main/webui/src/project/container/ContainerButtons.tsx
b/karavan-web/karavan-app/src/main/webui/src/project/container/ContainerButtons.tsx
index dfacb55f..4b33f64a 100644
---
a/karavan-web/karavan-app/src/main/webui/src/project/container/ContainerButtons.tsx
+++
b/karavan-web/karavan-app/src/main/webui/src/project/container/ContainerButtons.tsx
@@ -96,7 +96,7 @@ export function ContainerButtons (props: Props) {
</FlexItem>
{!isRunning && config.infrastructure !== 'kubernetes' &&
commands.includes('deploy') && <FlexItem>
<Tooltip content="Deploy container"
position={TooltipPosition.bottom}>
- <Button size="sm"
+ <Button className="dev-action-button" size="sm"
isDisabled={(!(commands.length === 0) &&
!commands.includes('deploy')) || inTransit}
variant={"primary"}
icon={<DeployIcon/>}
@@ -108,7 +108,7 @@ export function ContainerButtons (props: Props) {
</FlexItem>}
{!isRunning && config.infrastructure !== 'kubernetes' && <FlexItem>
<Tooltip content="Run container" position={TooltipPosition.bottom}>
- <Button size="sm"
+ <Button className="dev-action-button" size="sm"
isDisabled={(!(commands.length === 0) &&
!commands.includes('run')) || inTransit}
variant={"primary"}
icon={<RunIcon/>}
@@ -123,7 +123,7 @@ export function ContainerButtons (props: Props) {
{config.infrastructure !== 'kubernetes' &&
<FlexItem>
<Tooltip content="Stop container"
position={TooltipPosition.bottom}>
- <Button size="sm"
+ <Button className="dev-action-button" size="sm"
isDisabled={!commands.includes('stop') ||
inTransit}
variant={"control"}
icon={<StopIcon/>}
@@ -137,7 +137,7 @@ export function ContainerButtons (props: Props) {
}
<FlexItem>
<Tooltip content="Delete container"
position={TooltipPosition.bottom}>
- <Button size="sm"
+ <Button className="dev-action-button" size="sm"
isDisabled={!commands.includes('delete') || inTransit}
variant={"control"}
icon={<DeleteIcon/>}
diff --git
a/karavan-web/karavan-app/src/main/webui/src/project/container/ContainerPanel.tsx
b/karavan-web/karavan-app/src/main/webui/src/project/container/ContainerPanel.tsx
index 39221675..05a2505d 100644
---
a/karavan-web/karavan-app/src/main/webui/src/project/container/ContainerPanel.tsx
+++
b/karavan-web/karavan-app/src/main/webui/src/project/container/ContainerPanel.tsx
@@ -100,7 +100,7 @@ export function ContainerPanel (props: Props) {
const ready = cs.state === 'running';
return (
<Label icon={ready ? <UpIcon/> : <DownIcon/>}
color={ready ? "green" : "grey"}>
- <Button variant="link"
className="labeled-button"
+ <Button variant="link"
className="dev-action-button labeled-button"
onClick={e => {
setShowLog(true, 'container',
cs.containerName);
}}>
diff --git
a/karavan-web/karavan-app/src/main/webui/src/project/container/DeploymentPanel.tsx
b/karavan-web/karavan-app/src/main/webui/src/project/container/DeploymentPanel.tsx
index 8d84e9a0..61c1e2b3 100644
---
a/karavan-web/karavan-app/src/main/webui/src/project/container/DeploymentPanel.tsx
+++
b/karavan-web/karavan-app/src/main/webui/src/project/container/DeploymentPanel.tsx
@@ -112,7 +112,7 @@ export function DeploymentPanel (props: Props) {
function rolloutButton() {
return (<Tooltip content="Rollout deployment" position={"left"}>
<Button size="sm" variant="secondary"
- className="project-button"
+ className="project-button dev-action-button"
icon={<RolloutIcon/>}
onClick={e => {
setShowRolloutConfirmation(true);
diff --git
a/karavan-web/karavan-app/src/main/webui/src/project/files/FilesTab.tsx
b/karavan-web/karavan-app/src/main/webui/src/project/files/FilesTab.tsx
index 4a26cd89..b9c181ee 100644
--- a/karavan-web/karavan-app/src/main/webui/src/project/files/FilesTab.tsx
+++ b/karavan-web/karavan-app/src/main/webui/src/project/files/FilesTab.tsx
@@ -130,7 +130,7 @@ export function FilesTab () {
</Td>
<Td modifier={"fitContent"}>
{canDeleteFiles() &&
- <Button style={{padding: '0'}}
variant={"plain"}
+ <Button className="dev-action-button"
style={{padding: '0'}} variant={"plain"}
isDisabled={['application.properties',
'docker-compose.yaml'].includes(file.name)}
onClick={e =>
setFile('delete', file)
@@ -139,7 +139,7 @@ export function FilesTab () {
</Button>
}
<Tooltip content="Download source"
position={"bottom-end"}>
- <Button size="sm" variant="plain"
icon={<DownloadIcon/>} onClick={e => download(file)}/>
+ <Button className="dev-action-button"
size="sm" variant="plain" icon={<DownloadIcon/>} onClick={e => download(file)}/>
</Tooltip>
</Td>
</Tr>
diff --git
a/karavan-web/karavan-app/src/main/webui/src/project/files/FilesToolbar.tsx
b/karavan-web/karavan-app/src/main/webui/src/project/files/FilesToolbar.tsx
index 033ad6e0..5f4216e3 100644
--- a/karavan-web/karavan-app/src/main/webui/src/project/files/FilesToolbar.tsx
+++ b/karavan-web/karavan-app/src/main/webui/src/project/files/FilesToolbar.tsx
@@ -173,7 +173,7 @@ export function FileToolbar () {
<Tooltip content="Load Custom Kamelets to Library"
position={TooltipPosition.right}>
<Button size="sm"
variant={"secondary"}
- className="project-button"
+ className="project-button dev-action-button"
icon={<RefreshIcon/>}
onClick={() => {
ProjectService.reloadKamelets();
@@ -189,7 +189,7 @@ export function FileToolbar () {
size="sm"
variant={"secondary"}
isDanger
- className="project-button"
+ className="project-button dev-action-button"
icon={!isPulling ? <PushIcon/> : <div></div>}
onClick={() => {
setPullIsOpen(true);
@@ -203,7 +203,7 @@ export function FileToolbar () {
<Button isLoading={isPushing ? true : undefined}
size="sm"
variant={"secondary"}
- className="project-button"
+ className="project-button dev-action-button"
icon={!isPushing ? <PushIcon/> : <div></div>}
onClick={() => {
setCommitMessage(commitMessage === '' ? new
Date().toLocaleString() : commitMessage);
@@ -215,7 +215,7 @@ export function FileToolbar () {
</FlexItem>
{isTemplates() && config.infrastructure === 'kubernetes' && <FlexItem>
<Tooltip content="Update Build Script in Config Maps"
position={"bottom-end"}>
- <Button size="sm" variant={"primary"} icon={<UpdateIcon/>}
+ <Button className="dev-action-button" size="sm"
variant={"primary"} icon={<UpdateIcon/>}
onClick={e => updateScripts()}
>
Update Script
@@ -223,11 +223,11 @@ export function FileToolbar () {
</Tooltip>
</FlexItem>}
{canAddFiles() && <FlexItem>
- <Button size="sm" variant={"primary"} icon={<PlusIcon/>}
+ <Button className="dev-action-button" size="sm"
variant={"primary"} icon={<PlusIcon/>}
onClick={e => setFile("create")}>Create</Button>
</FlexItem>}
{canAddFiles() && <FlexItem>
- <Button size="sm" variant="secondary" icon={<UploadIcon/>}
+ <Button className="dev-action-button" size="sm"
variant="secondary" icon={<UploadIcon/>}
onClick={e => setFile("upload")}>Upload</Button>
</FlexItem>}
{getCommitModal()}
diff --git
a/karavan-web/karavan-app/src/main/webui/src/project/trace/TraceTable.tsx
b/karavan-web/karavan-app/src/main/webui/src/project/trace/TraceTable.tsx
index 8977825a..70b24359 100644
--- a/karavan-web/karavan-app/src/main/webui/src/project/trace/TraceTable.tsx
+++ b/karavan-web/karavan-app/src/main/webui/src/project/trace/TraceTable.tsx
@@ -102,7 +102,7 @@ export function TraceTable (props: Props) {
{node?.uid}
</Td>
<Td>
- <Button style={{padding: '0'}} variant={"link"}
+ <Button className="dev-action-button"
style={{padding: '0'}} variant={"link"}
onClick={e => {
setExchangeId(exchangeId);
setNodes(getNodes(exchangeId));
diff --git
a/karavan-web/karavan-app/src/main/webui/src/projects/ProjectsPage.tsx
b/karavan-web/karavan-app/src/main/webui/src/projects/ProjectsPage.tsx
index ec9eb25c..b7f86709 100644
--- a/karavan-web/karavan-app/src/main/webui/src/projects/ProjectsPage.tsx
+++ b/karavan-web/karavan-app/src/main/webui/src/projects/ProjectsPage.tsx
@@ -82,7 +82,8 @@ export function ProjectsPage () {
onChange={(_, e) => setFilter(e)}/>
</ToolbarItem>
<ToolbarItem>
- <Button icon={<PlusIcon/>}
+ <Button className="dev-action-button"
+ icon={<PlusIcon/>}
onClick={e =>
setProject(new Project(), 'create')}
>Create</Button>
diff --git
a/karavan-web/karavan-app/src/main/webui/src/projects/ProjectsTableRow.tsx
b/karavan-web/karavan-app/src/main/webui/src/projects/ProjectsTableRow.tsx
index e8e8972b..6e4da548 100644
--- a/karavan-web/karavan-app/src/main/webui/src/projects/ProjectsTableRow.tsx
+++ b/karavan-web/karavan-app/src/main/webui/src/projects/ProjectsTableRow.tsx
@@ -92,7 +92,7 @@ export function ProjectsTableRow (props: Props) {
spaceItems={{default: 'spaceItemsNone'}}>
<FlexItem>
<Tooltip content={"Copy project"}
position={"bottom"}>
- <Button variant={"plain"} icon={<CopyIcon/>}
+ <Button className="dev-action-button"
variant={"plain"} icon={<CopyIcon/>}
onClick={e => {
setProject(project, "copy");
}}></Button>
@@ -100,7 +100,7 @@ export function ProjectsTableRow (props: Props) {
</FlexItem>
<FlexItem>
<Tooltip content={"Delete project"}
position={"bottom"}>
- <Button variant={"plain"} icon={<DeleteIcon/>}
onClick={e => {
+ <Button className="dev-action-button"
variant={"plain"} icon={<DeleteIcon/>} onClick={e => {
setProject(project, "delete");
}}></Button>
</Tooltip>
diff --git
a/karavan-web/karavan-app/src/main/webui/src/services/ServicesPage.tsx
b/karavan-web/karavan-app/src/main/webui/src/services/ServicesPage.tsx
index 5aad2969..28f09a92 100644
--- a/karavan-web/karavan-app/src/main/webui/src/services/ServicesPage.tsx
+++ b/karavan-web/karavan-app/src/main/webui/src/services/ServicesPage.tsx
@@ -88,7 +88,7 @@ export function ServicesPage () {
<Button variant="link" icon={<RefreshIcon/>} onClick={e =>
getServices()}/>
</ToolbarItem>
<ToolbarItem>
- <Button icon={<PlusIcon/>}
+ <Button className="dev-action-button" icon={<PlusIcon/>}
onClick={e =>
useProjectStore.setState({operation: "create",
project: new Project()})}
>Create</Button>
diff --git
a/karavan-web/karavan-app/src/main/webui/src/topology/TopologyToolbar.tsx
b/karavan-web/karavan-app/src/main/webui/src/topology/TopologyToolbar.tsx
index 473bb6f9..667cf8f5 100644
--- a/karavan-web/karavan-app/src/main/webui/src/topology/TopologyToolbar.tsx
+++ b/karavan-web/karavan-app/src/main/webui/src/topology/TopologyToolbar.tsx
@@ -34,7 +34,7 @@ export function TopologyToolbar (props: Props) {
<ToolbarContent>
<ToolbarItem align={{default:"alignRight"}}>
<Tooltip content={"Add Integration Route"} position={"bottom"}>
- <Button size="sm"
+ <Button className="dev-action-button" size="sm"
variant={"primary"}
icon={<PlusIcon/>}
onClick={e => props.onClickAddRoute()}
@@ -45,7 +45,7 @@ export function TopologyToolbar (props: Props) {
</ToolbarItem>
<ToolbarItem align={{default:"alignRight"}}>
<Tooltip content={"Add REST API"} position={"bottom"}>
- <Button size="sm"
+ <Button className="dev-action-button" size="sm"
variant={"primary"}
icon={<PlusIcon/>}
onClick={e => props.onClickAddREST()}
@@ -56,7 +56,7 @@ export function TopologyToolbar (props: Props) {
</ToolbarItem>
<ToolbarItem align={{default:"alignRight"}}>
<Tooltip content={"Add Bean"} position={"bottom"}>
- <Button size="sm"
+ <Button className="dev-action-button" size="sm"
variant={"primary"}
icon={<PlusIcon/>}
onClick={e => props.onClickAddBean()}
