You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by ma...@apache.org on 2024/02/13 18:01:01 UTC
(camel-karavan) 02/02: Fix #1122
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
commit 88de999f0dc0abd51d1f094d74ce847efb44458d
Author: Marat Gubaidullin <ma...@talismancloud.io>
AuthorDate: Tue Feb 13 13:00:49 2024 -0500
Fix #1122
---
.../webui/src/project/files/DeleteFileModal.tsx | 15 +++++++---
.../main/webui/src/projects/DeleteProjectModal.tsx | 32 ++++++++++++++--------
2 files changed, 32 insertions(+), 15 deletions(-)
diff --git a/karavan-web/karavan-app/src/main/webui/src/project/files/DeleteFileModal.tsx b/karavan-web/karavan-app/src/main/webui/src/project/files/DeleteFileModal.tsx
index 05635cee..c89ba0ad 100644
--- a/karavan-web/karavan-app/src/main/webui/src/project/files/DeleteFileModal.tsx
+++ b/karavan-web/karavan-app/src/main/webui/src/project/files/DeleteFileModal.tsx
@@ -17,9 +17,9 @@
import React from 'react';
import {
- Button,
+ Button, HelperText, HelperTextItem,
Modal,
- ModalVariant,
+ ModalVariant, Text, TextContent, TextVariants,
} from '@patternfly/react-core';
import '../../designer/karavan.css';
import {useFileStore} from "../../api/ProjectStore";
@@ -46,12 +46,19 @@ export function DeleteFileModal () {
isOpen={isOpen}
onClose={() => closeModal()}
actions={[
- <Button key="confirm" variant="primary" onClick={e => confirmAndCloseModal()}>Delete</Button>,
+ <Button key="confirm" variant="danger" onClick={e => confirmAndCloseModal()}>Delete</Button>,
<Button key="cancel" variant="link"
onClick={e => closeModal()}>Cancel</Button>
]}
onEscapePress={e => closeModal()}>
- <div>{"Are you sure you want to delete file " + file?.name + "?"}</div>
+ <TextContent>
+ <Text component={TextVariants.h3}>Delete file <b>{file?.name}</b> ?</Text>
+ <HelperText>
+ <HelperTextItem variant="warning">
+ File will be also deleted from <b>git</b> repository
+ </HelperTextItem>
+ </HelperText>
+ </TextContent>
</Modal>
)
}
\ No newline at end of file
diff --git a/karavan-web/karavan-app/src/main/webui/src/projects/DeleteProjectModal.tsx b/karavan-web/karavan-app/src/main/webui/src/projects/DeleteProjectModal.tsx
index 574486cb..ce80c9f2 100644
--- a/karavan-web/karavan-app/src/main/webui/src/projects/DeleteProjectModal.tsx
+++ b/karavan-web/karavan-app/src/main/webui/src/projects/DeleteProjectModal.tsx
@@ -17,13 +17,14 @@
import React, {useState} from 'react';
import {
- Button,
+ Button, HelperText, HelperTextItem,
Modal,
- ModalVariant, Switch,
+ ModalVariant, Switch, Text, TextContent, TextVariants,
} from '@patternfly/react-core';
import '../designer/karavan.css';
import {useProjectStore} from "../api/ProjectStore";
import {ProjectService} from "../api/ProjectService";
+import ExclamationIcon from '@patternfly/react-icons/dist/esm/icons/exclamation-icon';
export function DeleteProjectModal () {
@@ -42,23 +43,32 @@ export function DeleteProjectModal () {
const isOpen= operation === "delete";
return (
<Modal
- title="Project delete confirmation"
+ title="Confirmation"
variant={ModalVariant.small}
isOpen={isOpen}
onClose={() => closeModal()}
actions={[
- <Button key="confirm" variant="primary" onClick={e => confirmAndCloseModal()}>Delete</Button>,
+ <Button key="confirm" variant="danger" onClick={e => confirmAndCloseModal()}>Delete</Button>,
<Button key="cancel" variant="link"
onClick={e => closeModal()}>Cancel</Button>
]}
onEscapePress={e => closeModal()}>
- {/*<div>{"Are you sure you want to delete the project " + project?.projectId + "?"}</div>*/}
- <Switch
- label={"Delete container and/or deployments?"}
- isChecked={deleteContainers}
- onChange={(_, checked) => setDeleteContainers(checked)}
- isReversed
- />
+ <TextContent>
+ <Text component={TextVariants.h3}>Delete project <b>{project?.projectId}</b> ?</Text>
+ <HelperText>
+ <HelperTextItem variant="warning">
+ Project will be also deleted from <b>git</b> repository
+ </HelperTextItem>
+ </HelperText>
+ <Text component={TextVariants.p}></Text>
+ <Text component={TextVariants.p}></Text>
+ </TextContent>
+ <Switch
+ label={"Delete related container and/or deployments?"}
+ isChecked={deleteContainers}
+ onChange={(_, checked) => setDeleteContainers(checked)}
+ isReversed
+ />
</Modal>
)
}
\ No newline at end of file