);
}
-}
\ No newline at end of file
+}
+
+FileTree.propTypes = {
+ isOverlayTree: PropTypes.bool,
+ isResourceTree: PropTypes.bool,
+ // boolean whether the provided tree is part of the base resources tree
+ isBaseTree: PropTypes.bool,
+ // function invoked when deleting a base resource
+ handleDeleteBase: PropTypes.func,
+};
diff --git a/web/init/src/components/kustomize/kustomize_overlay/KustomizeDeleteModal.jsx b/web/init/src/components/kustomize/kustomize_overlay/KustomizeDeleteModal.jsx
new file mode 100644
index 000000000..98d3256d8
--- /dev/null
+++ b/web/init/src/components/kustomize/kustomize_overlay/KustomizeDeleteModal.jsx
@@ -0,0 +1,44 @@
+import React from "react";
+import Modal from "react-modal";
+import PropTypes from "prop-types";
+
+const KustomizeDeleteModal = ({
+ isOpen,
+ onRequestClose,
+ discardOverlay,
+ message,
+ discardMessage,
+}) => (
+
+
+
{ message }
+
+
+
It will not be applied to the kustomization.yaml file that is generated for you.
+
+
+
+
+
+
+);
+
+KustomizeDeleteModal.propTypes = {
+ // boolean to control whether the modal is open
+ isOpen: PropTypes.bool,
+ onRequestClose: PropTypes.func,
+ discardOverlay: PropTypes.func,
+ // message to display in the body of the modal
+ message: PropTypes.string,
+ // text to display within the delete button
+ discardMessage: PropTypes.string,
+}
+
+export default KustomizeDeleteModal;
diff --git a/web/init/src/components/kustomize/kustomize_overlay/KustomizeOverlay.jsx b/web/init/src/components/kustomize/kustomize_overlay/KustomizeOverlay.jsx
index aa82ea100..f3db1165f 100644
--- a/web/init/src/components/kustomize/kustomize_overlay/KustomizeOverlay.jsx
+++ b/web/init/src/components/kustomize/kustomize_overlay/KustomizeOverlay.jsx
@@ -1,5 +1,4 @@
import React from "react";
-import Modal from "react-modal";
import AceEditor from "react-ace";
import ReactTooltip from "react-tooltip"
import * as yaml from "js-yaml";
@@ -8,11 +7,13 @@ import sortBy from "lodash/sortBy";
import pick from "lodash/pick";
import keyBy from "lodash/keyBy";
import find from "lodash/find";
+import findIndex from "lodash/findIndex";
import map from "lodash/map";
import defaultTo from "lodash/defaultTo";
import debounce from "lodash/debounce";
import FileTree from "./FileTree";
+import KustomizeDeleteModal from "./KustomizeDeleteModal";
import Loader from "../../shared/Loader";
import { AceEditorHOC, PATCH_TOKEN } from "./AceEditorHOC";
import DiffEditor from "../../shared/DiffEditor";
@@ -38,7 +39,9 @@ export default class KustomizeOverlay extends React.Component {
overlayToDelete: "",
addingNewResource: false,
newResourceName: "",
- lastSavedPatch: null
+ lastSavedPatch: null,
+ displayConfirmModalMessage: "",
+ displayConfirmModalDiscardMessage: "",
};
this.addResourceWrapper = React.createRef();
this.addResourceInput = React.createRef();
@@ -47,7 +50,18 @@ export default class KustomizeOverlay extends React.Component {
toggleModal = (overlayPath) => {
this.setState({
displayConfirmModal: !this.state.displayConfirmModal,
- overlayToDelete: this.state.displayConfirmModal ? "" : overlayPath
+ overlayToDelete: this.state.displayConfirmModal ? "" : overlayPath,
+ displayConfirmModalMessage: "Are you sure you want to discard this patch?",
+ displayConfirmModalDiscardMessage: "Discard patch",
+ });
+ }
+
+ toggleModalForBase = (overlayPath) => {
+ this.setState({
+ displayConfirmModal: !this.state.displayConfirmModal,
+ overlayToDelete: this.state.displayConfirmModal ? "" : overlayPath,
+ displayConfirmModalMessage: "Are you sure you want to discard this base resource?",
+ displayConfirmModalDiscardMessage: "Discard base",
});
}
@@ -171,10 +185,26 @@ export default class KustomizeOverlay extends React.Component {
}
deleteOverlay = async (path) => {
- const { fileTree } = this.state;
+ const { fileTree, selectedFile } = this.state;
const resources = find(fileTree, { name: "resources" });
- const isResource = resources && !!find(resources.children, { path });
- await this.props.deleteOverlay(path, isResource);
+ const bases = find(fileTree, { name: "/" });
+ const isResource = resources && findIndex(resources.children, { path }) > -1;
+ const isBase = findIndex(bases.children, { path }) > -1;
+ if (isResource) {
+ await this.props.deleteOverlay(path, "resource");
+ return;
+ }
+
+ if (isBase) {
+ if (selectedFile === path) {
+ this.setState({ selectedFile: "" });
+ }
+ await this.props.deleteOverlay(path, "base");
+ return;
+ }
+
+ await this.props.deleteOverlay(path, "patch");
+ return;
}
handleKustomizeSave = async (finalize) => {
@@ -317,14 +347,16 @@ export default class KustomizeOverlay extends React.Component {