Skip to content
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.

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

Backport of [ui] Prevent double-open for cmd+click on vars index links into release/1.9.x #24330

Open
wants to merge 1 commit into
base: release/1.9.x
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
3 changes: 3 additions & 0 deletions .changelog/24316.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
```release-note:bug
ui: Fix an issue where cmd+click or ctrl+click would double-open a var
```
18 changes: 16 additions & 2 deletions ui/app/components/variable-paths.js
Original file line number Diff line number Diff line change
Expand Up @@ -26,13 +26,27 @@ export default class VariablePathsComponent extends Component {
}

@action
async handleFolderClick(path) {
async handleFolderClick(path, trigger) {
// Don't navigate if the user clicked on a link; this will happen with modifier keys like cmd/ctrl on the link itself
if (
trigger instanceof PointerEvent &&
/** @type {HTMLElement} */ (trigger.target).tagName === 'A'
) {
return;
}
this.router.transitionTo('variables.path', path);
}

@action
async handleFileClick({ path, variable: { id, namespace } }) {
async handleFileClick({ path, variable: { id, namespace } }, trigger) {
if (this.can.can('read variable', null, { path, namespace })) {
// Don't navigate if the user clicked on a link; this will happen with modifier keys like cmd/ctrl on the link itself
if (
trigger instanceof PointerEvent &&
/** @type {HTMLElement} */ (trigger.target).tagName === 'A'
) {
return;
}
this.router.transitionTo('variables.variable', id);
}
}
Expand Down
5 changes: 0 additions & 5 deletions ui/app/controllers/variables/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -15,11 +15,6 @@ export default class VariablesIndexController extends Controller {

isForbidden = false;

@action
goToVariable(variable) {
this.router.transitionTo('variables.variable', variable.path);
}

@action goToNewVariable() {
this.router.transitionTo('variables.new');
}
Expand Down
Loading