Skip to content

Commit f3a48d2

Browse files
[ITEP-27177] Cluster Edit: Remove add/remove host (#89)
1 parent 129dd13 commit f3a48d2

3 files changed

Lines changed: 23 additions & 28 deletions

File tree

apps/cluster-orch/src/components/atom/ClusterEditNodeReview/ClusterEditNodeReview.cy.tsx

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,10 +23,6 @@ describe("<ClusterEditNodeReview/>", () => {
2323
pom.root.should("exist");
2424
pom.root.should("contain.text", "No hosts available.");
2525
});
26-
it("should click `Add Host` to call @addNode handler function for opening drawer", () => {
27-
pom.el.addHostBtn.click();
28-
cy.get("@addNode").should("be.called");
29-
});
3026
});
3127

3228
describe("when nodes/hosts are available", () => {

apps/cluster-orch/src/components/atom/ClusterEditNodeReview/ClusterEditNodeReview.tsx

Lines changed: 18 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,7 @@
55

66
import { cm } from "@orch-ui/apis";
77
import { TableColumn } from "@orch-ui/components";
8-
import { Button, Heading, Table } from "@spark-design/react";
9-
import { ButtonSize, ButtonVariant } from "@spark-design/tokens";
8+
import { Heading, Table } from "@spark-design/react";
109
import { NodeTableColumns } from "../../../utils/NodeTableColumns";
1110
import NodeRoleDropdown from "../NodeRoleDropdown/NodeRoleDropdown";
1211

@@ -21,17 +20,15 @@ interface ClusterEditNodeReviewProps {
2120
/** Notify any changes to node via the node dropdown */
2221
onNodeUpdate: (node: cm.NodeInfo, value: NodeRoles) => void;
2322
/** Notify click on Add Host button */
24-
onAddNode: () => void;
23+
onAddNode?: () => void;
2524
/** Notify click on Remove Host button */
26-
onRemoveNode: (node: cm.NodeInfo) => void;
25+
onRemoveNode?: (node: cm.NodeInfo) => void;
2726
}
2827

2928
const ClusterEditNodeReview = ({
3029
clusterNodeList = [],
3130
configuredClusterNode = [],
3231
onNodeUpdate,
33-
onAddNode,
34-
onRemoveNode,
3532
}: ClusterEditNodeReviewProps) => {
3633
const cy = { "data-cy": dataCy };
3734

@@ -56,17 +53,18 @@ const ClusterEditNodeReview = ({
5653
/>
5754
);
5855
}),
59-
NodeTableColumns.actions((node) => (
60-
<Button
61-
data-cy="removeHostBtn"
62-
className="remove-host-button"
63-
size={ButtonSize.Medium}
64-
variant={ButtonVariant.Ghost}
65-
onPress={() => onRemoveNode(node)}
66-
>
67-
Remove from Cluster
68-
</Button>
69-
)),
56+
/** This is not supported by Cluster Manager (cm) Api */
57+
// NodeTableColumns.actions((node) => (
58+
// <Button
59+
// data-cy="removeHostBtn"
60+
// className="remove-host-button"
61+
// size={ButtonSize.Medium}
62+
// variant={ButtonVariant.Ghost}
63+
// onPress={() => onRemoveNode(node)}
64+
// >
65+
// Remove from Cluster
66+
// </Button>
67+
// )),
7068
];
7169

7270
return (
@@ -96,15 +94,16 @@ const ClusterEditNodeReview = ({
9694
"No hosts available."
9795
)}
9896

99-
<Button
97+
{/** This is not supported by Cluster Manager (cm) Api */}
98+
{/* <Button
10099
data-cy="addHostBtn"
101100
className="add-host-button"
102101
size={ButtonSize.Large}
103102
variant={ButtonVariant.Secondary}
104103
onPress={onAddNode}
105104
>
106105
Add Host
107-
</Button>
106+
</Button> */}
108107
</div>
109108
);
110109
};

apps/cluster-orch/src/components/organism/ClusterEdit/HostSelection/HostSelection.cy.tsx

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -112,19 +112,19 @@ describe("<HostSelection/>", () => {
112112
pom.root.should("exist");
113113
});
114114

115-
it("should open drawer", () => {
115+
xit("should open drawer", () => {
116116
pom.clusterSelectedNodeReviewTablePom.el.addHostBtn.click();
117117
pom.clusterAddNodeDrawerPom.root.should("exist");
118118
});
119119

120-
it("should open and close drawer by cancel", () => {
120+
xit("should open and close drawer by cancel", () => {
121121
pom.clusterSelectedNodeReviewTablePom.el.addHostBtn.click();
122122
pom.getAddNodeDrawerBase().should("have.class", "spark-drawer-show");
123123
pom.clusterAddNodeDrawerPom.el.cancelBtn.click();
124124
pom.getAddNodeDrawerBase().should("have.class", "spark-drawer-hide");
125125
});
126126

127-
it("should open and close drawer from header", () => {
127+
xit("should open and close drawer from header", () => {
128128
pom.clusterSelectedNodeReviewTablePom.el.addHostBtn.click();
129129
pom.getAddNodeDrawerBase().should("have.class", "spark-drawer-show");
130130
pom.clusterAddNodeDrawerPom.root
@@ -133,7 +133,7 @@ describe("<HostSelection/>", () => {
133133
pom.getAddNodeDrawerBase().should("have.class", "spark-drawer-hide");
134134
});
135135

136-
describe("should see host selection from drawer to review table", () => {
136+
xdescribe("should see host selection from drawer to review table", () => {
137137
beforeEach(() => {
138138
pom.clusterSelectedNodeReviewTablePom.el.addHostBtn.click();
139139
pom.clusterAddNodeDrawerPom.nodeTablePom.el.rowSelectCheckbox.click();
@@ -186,7 +186,7 @@ describe("<HostSelection/>", () => {
186186
});
187187
});
188188

189-
it("will remove host from cluster", () => {
189+
xit("will remove host from cluster", () => {
190190
pom.clusterSelectedNodeReviewTablePom.table
191191
.getRowBySearchText("host-dh38bjw9")
192192
.find("[data-cy='removeHostBtn']")

0 commit comments

Comments
 (0)