Skip to content

CodeQL model editor: Make "add" and "delete" buttons more intuitive #3123

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
shati-patel merged 1 commit into from
Dec 12, 2023
Merged

CodeQL model editor: Make "add" and "delete" buttons more intuitive #3123

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion extensions/ql-vscode/src/view/model-editor/MethodRow.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -269,7 +269,7 @@ const ModelableMethodRow = forwardRef<HTMLElement | undefined, MethodRowProps>(
</DataGridCell>
{viewState.showMultipleModels && (
<DataGridCell>
{index === modeledMethods.length - 1 ? (
{index === 0 ? (
<CodiconRow
appearance="icon"
aria-label="Add new model"
Expand Down
8 changes: 4 additions & 4 deletions extensions/ql-vscode/src/view/model-editor/__tests__/MethodRow.spec.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -350,7 +350,7 @@ describe(MethodRow.name, () => {
expect(removeButton?.getElementsByTagName("input")[0]).toBeEnabled();
});

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

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

expect(onChange).toHaveBeenCalledTimes(1);
expect(onChange).toHaveBeenCalledWith(method.signature, [
{ ...modeledMethod, type: "sink" },
{ ...modeledMethod, type: "source" },
{ ...modeledMethod, type: "none" },
{ ...modeledMethod, type: "summary" },
]);
Expand All @@ -441,7 +441,7 @@ describe(MethodRow.name, () => {
});

onChange.mockReset();
await userEvent.click(screen.getAllByLabelText("Remove model")[2]);
await userEvent.click(screen.getAllByLabelText("Remove model")[1]);

expect(onChange).toHaveBeenCalledTimes(1);
expect(onChange).toHaveBeenCalledWith(method.signature, [
Expand Down