Skip to content

Commit 9cb4d23

Browse files
authored
CodeQL model editor: Make "add" and "delete" buttons more intuitive (#3123)
1 parent 8fac9b1 commit 9cb4d23

File tree

2 files changed

+5
-5
lines changed

2 files changed

+5
-5
lines changed

extensions/ql-vscode/src/view/model-editor/MethodRow.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -269,7 +269,7 @@ const ModelableMethodRow = forwardRef<HTMLElement | undefined, MethodRowProps>(
269269
</DataGridCell>
270270
{viewState.showMultipleModels && (
271271
<DataGridCell>
272-
{index === modeledMethods.length - 1 ? (
272+
{index === 0 ? (
273273
<CodiconRow
274274
appearance="icon"
275275
aria-label="Add new model"

extensions/ql-vscode/src/view/model-editor/__tests__/MethodRow.spec.tsx

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -350,7 +350,7 @@ describe(MethodRow.name, () => {
350350
expect(removeButton?.getElementsByTagName("input")[0]).toBeEnabled();
351351
});
352352

353-
it("shows add model button on last row and remove model button on all other rows", async () => {
353+
it("shows add model button on first row and remove model button on all other rows", async () => {
354354
render({
355355
modeledMethods: [
356356
{ ...modeledMethod, type: "source" },
@@ -401,7 +401,7 @@ describe(MethodRow.name, () => {
401401
]);
402402
});
403403

404-
it("can delete the first modeled method", async () => {
404+
it("cannot delete the first modeled method (but delete second instead)", async () => {
405405
render({
406406
modeledMethods: [
407407
{ ...modeledMethod, type: "source" },
@@ -420,7 +420,7 @@ describe(MethodRow.name, () => {
420420

421421
expect(onChange).toHaveBeenCalledTimes(1);
422422
expect(onChange).toHaveBeenCalledWith(method.signature, [
423-
{ ...modeledMethod, type: "sink" },
423+
{ ...modeledMethod, type: "source" },
424424
{ ...modeledMethod, type: "none" },
425425
{ ...modeledMethod, type: "summary" },
426426
]);
@@ -441,7 +441,7 @@ describe(MethodRow.name, () => {
441441
});
442442

443443
onChange.mockReset();
444-
await userEvent.click(screen.getAllByLabelText("Remove model")[2]);
444+
await userEvent.click(screen.getAllByLabelText("Remove model")[1]);
445445

446446
expect(onChange).toHaveBeenCalledTimes(1);
447447
expect(onChange).toHaveBeenCalledWith(method.signature, [

0 commit comments

Comments
 (0)