diff --git a/addons/api/addon/services/resource-filter-store.js b/addons/api/addon/services/resource-filter-store.js index 949541dac..9dbca0f5e 100644 --- a/addons/api/addon/services/resource-filter-store.js +++ b/addons/api/addon/services/resource-filter-store.js @@ -104,7 +104,6 @@ export default class ResourceFilterStoreService extends Service { const query = Object.assign({}, storeQuery); // Apply filters to store query when available if (filter.queryExpression) query.filter = filter.queryExpression; - console.log(modelName, query, 'queryyyyy', this.store.query(modelName, query)) return this.store.query(modelName, query); } } diff --git a/addons/core/addon/helpers/resource-filter-param.js b/addons/core/addon/helpers/resource-filter-param.js index fefc30009..e78ac20a7 100644 --- a/addons/core/addon/helpers/resource-filter-param.js +++ b/addons/core/addon/helpers/resource-filter-param.js @@ -49,19 +49,14 @@ export default class ResourceFilterParamHelper extends Helper { * @return {object} */ compute([routeName, name]) { - console.log(routeName, name, 'route namess') const owner = getOwner(this); // Filter options const route = owner.lookup(`route:${routeName}`); const filterAllowedValuesKey = `filter-allowed-values-${name}`; - console.log(route, filterAllowedValuesKey, 'foiltallowed values') const allowedValues = route[filterAllowedValuesKey]; - console.log(allowedValues, 'allowed values') - // Selected filters const rawValue = route[name]; const selectedValue = rawValue || null; - console.log(name, allowedValues, selectedValue, 'pfcrrfe') return { name, allowedValues, selectedValue }; } diff --git a/addons/rose/addon/components/rose/dropdown/index.stories.mdx b/addons/rose/addon/components/rose/dropdown/index.stories.mdx index 985e9011f..625447e19 100644 --- a/addons/rose/addon/components/rose/dropdown/index.stories.mdx +++ b/addons/rose/addon/components/rose/dropdown/index.stories.mdx @@ -1,6 +1,6 @@ import { Meta, Story, Preview } from '@storybook/addon-docs/blocks'; import { hbs } from 'ember-cli-htmlbars'; -import { boolean, object } from '@storybook/addon-knobs'; +import { number, boolean, object } from '@storybook/addon-knobs'; import { action } from '@storybook/addon-actions'; diff --git a/addons/rose/addon/styles/rose/components/dropdown/_dropdown.scss b/addons/rose/addon/styles/rose/components/dropdown/_dropdown.scss index 785708943..62a8f3d36 100644 --- a/addons/rose/addon/styles/rose/components/dropdown/_dropdown.scss +++ b/addons/rose/addon/styles/rose/components/dropdown/_dropdown.scss @@ -103,6 +103,10 @@ $chevronGrey: url("data:image/svg+xml;utf-8, aggregate.session.status === 'active'), ...sortedSessionAggregates.filter((aggregate) => aggregate.session.status !== 'active'), ]; - console.log(sessionAggregates, 'sorted aggrefa') return sortedSessionAggregates; } @@ -129,7 +126,6 @@ export default class ScopesScopeSessionsRoute extends Route { */ @action filterBy(field, value) { - console.log(field, value, 'actionnnn') this[field] = value; } diff --git a/ui/admin/app/templates/scopes/scope/sessions/index.hbs b/ui/admin/app/templates/scopes/scope/sessions/index.hbs index 8082c77a4..9b16b38ea 100644 --- a/ui/admin/app/templates/scopes/scope/sessions/index.hbs +++ b/ui/admin/app/templates/scopes/scope/sessions/index.hbs @@ -13,60 +13,50 @@ - {{{log @model (has-resource-filter-param-selections 'scopes.scope.sessions') 'ppppp'}}} - {{{log (resource-filter-param 'scopes.scope.sessions' 'status') 'ferfre' }}} + {{#if + (or @model (has-resource-filter-param-selections 'scopes.scope.sessions')) + }} + + + {{#with + (resource-filter-param 'scopes.scope.sessions' 'status') + as |filter| + }} + - {{#if - (or - @model - (has-resource-filter-param-selections 'scopes.scope.sessions') - ) - }} - - - {{#with - (resource-filter-param 'scopes.scope.sessions' 'status') - as |filter| - }} - - - - - - - - - {{/with}} + + + + + + {{/with}} - {{#if - (has-resource-filter-param-selections 'scopes.scope.sessions') - }} - {{t 'actions.clear-all-filters'}} - - {{/if}} - - - {{/if}} + {{#if (has-resource-filter-param-selections 'scopes.scope.sessions')}} + {{t 'actions.clear-all-filters'}} + + {{/if}} + + + {{/if}} {{#if @model}} @@ -139,9 +129,7 @@ {{/each}} - {{else if (has-resource-filter-param-selections - 'scopes.scope.sessions' - )}} + {{else if (has-resource-filter-param-selections 'scopes.scope.sessions')}} @@ -149,8 +137,8 @@ - {{else}} - + {{else}} + -{{/if}} + {{/if}} \ No newline at end of file