scottk/vault
1
0
Fork 0
mirror of https://github.com/optim-enterprises-bv/vault.git synced 2025-11-02 11:38:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

UI/utils cleanup (#21863)

Browse Source 
* key-utils: create core addon and tests

* key-util: remove lib/key-utils and replace all imports with core util
This commit is contained in:
Chelsea Shaw
2023-07-14 14:45:57 -05:00
committed by GitHub
parent cc366f6cba
commit 88ca498fb4
14 changed files with 119 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
ui/lib/core/addon/components/navigate-input.js
View File

@@ -3,17 +3,17 @@
* SPDX-License-Identifier: MPL-2.0
*/
import Ember from 'ember';
import { debounce, later } from '@ember/runloop';
import { inject as service } from '@ember/service';
import { action } from '@ember/object';
import { guidFor } from '@ember/object/internals';
import Component from '@glimmer/component';
// TODO MOVE THESE TO THE ADDON
import utils from 'vault/lib/key-utils';
import keys from 'vault/lib/keycodes';
import { encodePath } from 'vault/utils/path-encoding-helpers';
import Ember from 'ember';
import { keyIsFolder, parentKeyForKey } from 'core/utils/key-utils';
// TODO MOVE THESE TO THE ADDON
import keys from 'vault/lib/keycodes';
/**
* @module NavigateInput
@@ -94,7 +94,7 @@ export default class NavigateInput extends Component {
if (mode.startsWith('secrets') && (!val || val === baseKey)) {
return;
}
if (this.args.filterMatchesKey && !utils.keyIsFolder(val)) {
if (this.args.filterMatchesKey && !keyIsFolder(val)) {
const params = [routeFor('show', mode, this.args.urls), extraParams, this.keyForNav(val)].compact();
this.transitionToRoute(...params);
} else {
@@ -126,7 +126,7 @@ export default class NavigateInput extends Component {
// pop to the nearest parentKey or to the root
onEscape(val) {
const key = utils.parentKeyForKey(val) || '';
const key = parentKeyForKey(val) || '';
this.args.filterDidChange(key);
this.filterUpdated(key);
}
@@ -150,11 +150,11 @@ export default class NavigateInput extends Component {
}
// select the key to nav to, assumed to be a folder
let key = val ? val.trim() : '';
const isFolder = utils.keyIsFolder(key);
const isFolder = keyIsFolder(key);
if (!isFolder) {
// nav to the closest parentKey (or the root)
key = utils.parentKeyForKey(val) || '';
key = parentKeyForKey(val) || '';
}
const pageFilter = val.replace(key, '');
@@ -167,7 +167,7 @@ export default class NavigateInput extends Component {
if (key) {
args.push(key);
}
if (pageFilter && !utils.keyIsFolder(pageFilter)) {
if (pageFilter && !keyIsFolder(pageFilter)) {
args.push({
queryParams: {
page: 1,