mirror of
https://github.com/TryGhost/Ghost.git
synced 2025-02-24 23:48:13 -05:00
Moved members screen filter components into components/members
no issue - currently the components are screen-specific rather than generalised so shouldn't have the `gh-` prefix - fixed linter error for confusing `{{#unless}}...{{else}}` usage
This commit is contained in:
parent
b287c881eb
commit
b80ce527e5
6 changed files with 12 additions and 10 deletions
|
@ -1792,3 +1792,4 @@ add|ember-template-lint|no-passed-in-event-handlers|50|12|50|12|8deb1881d48f9362
|
||||||
add|ember-template-lint|no-passed-in-event-handlers|51|12|51|12|db0e4b1769dec0725404801686f1e4fbf6fbb795|1644278400000|1646870400000|1649458800000|app/components/gh-members-filter-value.hbs
|
add|ember-template-lint|no-passed-in-event-handlers|51|12|51|12|db0e4b1769dec0725404801686f1e4fbf6fbb795|1644278400000|1646870400000|1649458800000|app/components/gh-members-filter-value.hbs
|
||||||
add|ember-template-lint|no-passed-in-event-handlers|97|8|97|8|8deb1881d48f936269c7960537ad72bfe4dfd760|1644278400000|1646870400000|1649458800000|app/components/gh-members-filter-value.hbs
|
add|ember-template-lint|no-passed-in-event-handlers|97|8|97|8|8deb1881d48f936269c7960537ad72bfe4dfd760|1644278400000|1646870400000|1649458800000|app/components/gh-members-filter-value.hbs
|
||||||
add|ember-template-lint|no-passed-in-event-handlers|98|8|98|8|db0e4b1769dec0725404801686f1e4fbf6fbb795|1644278400000|1646870400000|1649458800000|app/components/gh-members-filter-value.hbs
|
add|ember-template-lint|no-passed-in-event-handlers|98|8|98|8|db0e4b1769dec0725404801686f1e4fbf6fbb795|1644278400000|1646870400000|1649458800000|app/components/gh-members-filter-value.hbs
|
||||||
|
remove|ember-template-lint|simple-unless|138|4|138|4|02b279bc993a1ee6632c7e6edf341a2aabc519cb|1643760000000|1646352000000|1648940400000|app/templates/members.hbs
|
||||||
|
|
|
@ -27,8 +27,9 @@ const FILTER_OPTIONS = {
|
||||||
]
|
]
|
||||||
};
|
};
|
||||||
|
|
||||||
export default class GhMembersFilterValue extends Component {
|
export default class MembersFilterValue extends Component {
|
||||||
@tracked filterValue;
|
@tracked filterValue;
|
||||||
|
|
||||||
constructor(...args) {
|
constructor(...args) {
|
||||||
super(...args);
|
super(...args);
|
||||||
this.availableFilterOptions = FILTER_OPTIONS;
|
this.availableFilterOptions = FILTER_OPTIONS;
|
|
@ -43,7 +43,7 @@
|
||||||
/>
|
/>
|
||||||
{{svg-jar "arrow-down-small"}}
|
{{svg-jar "arrow-down-small"}}
|
||||||
</span>
|
</span>
|
||||||
<GhMembersFilterValue
|
<Members::FilterValue
|
||||||
@filter={{filter}}
|
@filter={{filter}}
|
||||||
@setFilterValue={{this.setFilterValue}}
|
@setFilterValue={{this.setFilterValue}}
|
||||||
@onLabelEdit={{@onLabelEdit}}
|
@onLabelEdit={{@onLabelEdit}}
|
|
@ -100,7 +100,7 @@ const FILTER_VALUE_OPTIONS = {
|
||||||
{label: 'Incomplete - Expired', name: 'incomplete_expired'}
|
{label: 'Incomplete - Expired', name: 'incomplete_expired'}
|
||||||
]
|
]
|
||||||
};
|
};
|
||||||
export default class GhMembersFilter extends Component {
|
export default class MembersFilter extends Component {
|
||||||
@service session
|
@service session
|
||||||
@tracked filters = A([
|
@tracked filters = A([
|
||||||
EmberObject.create({
|
EmberObject.create({
|
|
@ -20,7 +20,7 @@
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div class="view-actions-top-row">
|
<div class="view-actions-top-row">
|
||||||
<GhMembersFilter
|
<Members::Filter
|
||||||
@isFiltered={{this.isFiltered}}
|
@isFiltered={{this.isFiltered}}
|
||||||
@onApplyFilter={{this.applyFilter}}
|
@onApplyFilter={{this.applyFilter}}
|
||||||
@defaultFilterParam={{this.filterParam}}
|
@defaultFilterParam={{this.filterParam}}
|
||||||
|
@ -97,7 +97,11 @@
|
||||||
</section>
|
</section>
|
||||||
</GhCanvasHeader>
|
</GhCanvasHeader>
|
||||||
|
|
||||||
{{#unless this.members.loading}}
|
{{#if this.members.loading}}
|
||||||
|
<div class="gh-content">
|
||||||
|
<GhLoadingSpinner />
|
||||||
|
</div>
|
||||||
|
{{else}}
|
||||||
<section class="view-container">
|
<section class="view-container">
|
||||||
{{#if this.members}}
|
{{#if this.members}}
|
||||||
<div class="gh-list-scrolling {{if (lt this.members.length 6) "gh-list-with-helpsection"}}">
|
<div class="gh-list-scrolling {{if (lt this.members.length 6) "gh-list-with-helpsection"}}">
|
||||||
|
@ -169,11 +173,7 @@
|
||||||
</div>
|
</div>
|
||||||
{{/if}}
|
{{/if}}
|
||||||
</section>
|
</section>
|
||||||
{{else}}
|
{{/if}}
|
||||||
<div class="gh-content">
|
|
||||||
<GhLoadingSpinner />
|
|
||||||
</div>
|
|
||||||
{{/unless}}
|
|
||||||
</section>
|
</section>
|
||||||
|
|
||||||
{{outlet}}
|
{{outlet}}
|
||||||
|
|
Loading…
Add table
Reference in a new issue