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 ff8a2c1 Alert user that the Deployment is running. Deployment should
be dele… (#574)
ff8a2c1 is described below
commit ff8a2c19a4d2a4b8244c7714d47dad24edb32bed
Author: Mrinal Sharma <[email protected]>
AuthorDate: Tue Jan 3 10:27:06 2023 -0500
Alert user that the Deployment is running. Deployment should be dele…
(#574)
* Alert user that the Deployment is running. Deployment should be deleted
before a project can be deleted.
* fixed formatting
* Implemented PR comments
* Modified Modal dialig variable name
---
karavan-app/src/main/webui/src/api/KaravanApi.tsx | 5 +-
.../src/main/webui/src/projects/ProjectInfo.tsx | 2 +-
.../src/main/webui/src/projects/ProjectsPage.tsx | 63 ++++++++++++++++------
3 files changed, 53 insertions(+), 17 deletions(-)
diff --git a/karavan-app/src/main/webui/src/api/KaravanApi.tsx
b/karavan-app/src/main/webui/src/api/KaravanApi.tsx
index 3015400..5d9e84d 100644
--- a/karavan-app/src/main/webui/src/api/KaravanApi.tsx
+++ b/karavan-app/src/main/webui/src/api/KaravanApi.tsx
@@ -156,12 +156,15 @@ export class KaravanApi {
});
}
- static async getProjectPipelineStatus(projectId: string, env: string,
after: (status: PipelineStatus) => void) {
+ static async getProjectPipelineStatus(projectId: string, env: string,
after: (status?: PipelineStatus) => void) {
instance.get('/api/status/pipeline/' + projectId + "/" + env)
.then(res => {
if (res.status === 200) {
after(res.data);
+ } else if (res.status === 204) {
+ after(undefined);
}
+
}).catch(err => {
console.log(err);
});
diff --git a/karavan-app/src/main/webui/src/projects/ProjectInfo.tsx
b/karavan-app/src/main/webui/src/projects/ProjectInfo.tsx
index a5af48f..ecb89a0 100644
--- a/karavan-app/src/main/webui/src/projects/ProjectInfo.tsx
+++ b/karavan-app/src/main/webui/src/projects/ProjectInfo.tsx
@@ -78,7 +78,7 @@ export class ProjectInfo extends React.Component<Props,
State> {
const projectId = this.props.project.projectId;
const environment = this.state.environment;
if (this.props.project) {
- KaravanApi.getProjectPipelineStatus(projectId, environment,
(status: PipelineStatus) => {
+ KaravanApi.getProjectPipelineStatus(projectId, environment,
(status?: PipelineStatus) => {
this.setState({pipelineStatus: status});
// console.log(status);
});
diff --git a/karavan-app/src/main/webui/src/projects/ProjectsPage.tsx
b/karavan-app/src/main/webui/src/projects/ProjectsPage.tsx
index ea39653..3683cd6 100644
--- a/karavan-app/src/main/webui/src/projects/ProjectsPage.tsx
+++ b/karavan-app/src/main/webui/src/projects/ProjectsPage.tsx
@@ -1,5 +1,6 @@
import React from 'react';
import {
+ Alert,
Toolbar,
ToolbarContent,
ToolbarItem,
@@ -23,7 +24,7 @@ import '../designer/karavan.css';
import {MainToolbar} from "../MainToolbar";
import RefreshIcon from '@patternfly/react-icons/dist/esm/icons/sync-alt-icon';
import PlusIcon from '@patternfly/react-icons/dist/esm/icons/plus-icon';
-import {DeploymentStatus, Project} from "./ProjectModels";
+import {DeploymentStatus, Project, PipelineStatus} from "./ProjectModels";
import {TableComposable, Tbody, Td, Th, Thead, Tr} from
"@patternfly/react-table";
import SearchIcon from '@patternfly/react-icons/dist/esm/icons/search-icon';
import {CamelUi} from "../designer/utils/CamelUi";
@@ -43,6 +44,7 @@ interface State {
deploymentStatuses: DeploymentStatus[],
isCreateModalOpen: boolean,
isDeleteModalOpen: boolean,
+ isProjectDeploymentModalOpen: boolean,
isCopy: boolean,
loading: boolean,
projectToCopy?: Project,
@@ -61,6 +63,7 @@ export class ProjectsPage extends React.Component<Props,
State> {
deploymentStatuses: [],
isCreateModalOpen: false,
isDeleteModalOpen: false,
+ isProjectDeploymentModalOpen: false,
isCopy: false,
loading: true,
filter: '',
@@ -80,7 +83,20 @@ export class ProjectsPage extends React.Component<Props,
State> {
}
onProjectDelete = (project: Project) => {
- this.setState({isDeleteModalOpen: true, projectToDelete: project})
+ KaravanApi.getProjectPipelineStatus(project.projectId,
this.props.config.environment, (status?: PipelineStatus) => {
+ if (status?.result === "Running" || status?.result === "Started") {
+ this.setState({ isProjectDeploymentModalOpen: true,
projectToDelete: project })
+ } else {
+ KaravanApi.getProjectDeploymentStatus(project.projectId,
this.props.config.environment, (status?: DeploymentStatus) => {
+ if (status === undefined) {
+ this.setState({ isDeleteModalOpen: true,
projectToDelete: project })
+ }
+ else {
+ this.setState({ isProjectDeploymentModalOpen: true,
projectToDelete: project })
+ }
+ });
+ }
+ });
};
@@ -213,19 +229,36 @@ export class ProjectsPage extends React.Component<Props,
State> {
deleteModalForm() {
return (
- <Modal
- title="Confirmation"
- variant={ModalVariant.small}
- isOpen={this.state.isDeleteModalOpen}
- onClose={() => this.setState({isDeleteModalOpen: false})}
- actions={[
- <Button key="confirm" variant="primary" onClick={e =>
this.deleteProject()}>Delete</Button>,
- <Button key="cancel" variant="link"
- onClick={e => this.setState({isDeleteModalOpen:
false})}>Cancel</Button>
- ]}
- onEscapePress={e => this.setState({isDeleteModalOpen: false})}>
- <div>{"Are you sure you want to delete the project " +
this.state.projectToDelete?.projectId + "?"}</div>
- </Modal>
+ <div>
+ {(this.state.isDeleteModalOpen === true) && <Modal
+ title="Confirmation"
+ variant={ModalVariant.small}
+ isOpen={this.state.isDeleteModalOpen}
+ onClose={() => this.setState({ isDeleteModalOpen: false })}
+ actions={[
+ <Button key="confirm" variant="primary" onClick={e =>
this.deleteProject()}>Delete</Button>,
+ <Button key="cancel" variant="link"
+ onClick={e => this.setState({ isDeleteModalOpen:
false })}>Cancel</Button>
+ ]}
+ onEscapePress={e => this.setState({ isDeleteModalOpen:
false })}>
+ <div>{"Are you sure you want to delete the project " +
this.state.projectToDelete?.projectId + "?"}</div>
+ </Modal>
+ }
+ {(this.state.isProjectDeploymentModalOpen === true) && <Modal
+ variant={ModalVariant.small}
+ isOpen={this.state.isProjectDeploymentModalOpen}
+ onClose={() => this.setState({
isProjectDeploymentModalOpen: false })}
+ onEscapePress={e => this.setState({
isProjectDeploymentModalOpen: false })}>
+ <div>
+ <Alert key={this.state.projectToDelete?.projectId}
className="main-alert" variant="warning"
+ title={"Deployment is Running!!"} isInline={true}
isPlain={true}>
+ {"Delete the deployment (" +
this.state.projectToDelete?.projectId + ")" + " first."}
+ </Alert>
+ </div>
+ </Modal>
+
+ }
+ </div>
)
}