From ee32a4d0d91a9fb7c93354edbc0b74e6cf9f70a4 Mon Sep 17 00:00:00 2001 From: Angel Garbarino Date: Wed, 28 Feb 2024 09:49:14 -0700 Subject: [PATCH] Ember upgrade prep: deprecate ember-data:no-a-with-array-like (#25674) * remove @filterBy * remove filterBy in old classic --- ui/app/controllers/vault/cluster/secrets/backends.js | 6 ++++-- ui/app/services/console.js | 6 +++--- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/ui/app/controllers/vault/cluster/secrets/backends.js b/ui/app/controllers/vault/cluster/secrets/backends.js index 17f964a5a5..b7e7df813f 100644 --- a/ui/app/controllers/vault/cluster/secrets/backends.js +++ b/ui/app/controllers/vault/cluster/secrets/backends.js @@ -7,18 +7,20 @@ import Controller from '@ember/controller'; import { service } from '@ember/service'; import { action } from '@ember/object'; import { tracked } from '@glimmer/tracking'; -import { filterBy } from '@ember/object/computed'; import { dropTask } from 'ember-concurrency'; export default class VaultClusterSecretsBackendController extends Controller { @service flashMessages; - @filterBy('model', 'shouldIncludeInList') displayableBackends; @tracked secretEngineOptions = []; @tracked selectedEngineType = null; @tracked selectedEngineName = null; @tracked engineToDisable = null; + get displayableBackends() { + return this.model.filter((backend) => backend.shouldIncludeInList); + } + get sortedDisplayableBackends() { // show supported secret engines first and then organize those by id. const sortedBackends = this.displayableBackends.sort( diff --git a/ui/app/services/console.js b/ui/app/services/console.js index 8e8d91c91e..96ecc257d4 100644 --- a/ui/app/services/console.js +++ b/ui/app/services/console.js @@ -5,8 +5,6 @@ // Low level service that allows users to input paths to make requests to vault // this service provides the UI synecdote to the cli commands read, write, delete, and list -import { filterBy } from '@ember/object/computed'; - import Service from '@ember/service'; import { getOwner } from '@ember/application'; @@ -28,7 +26,9 @@ export default Service.extend({ adapter() { return getOwner(this).lookup('adapter:console'); }, - commandHistory: filterBy('log', 'type', 'command'), + get commandHistory() { + return this.log.filter((log) => log.type === 'command'); + }, log: computed(function () { return []; }),