yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

set default filter trough constructor

Browse Source
This commit is contained in:
Mads Rasmussen
2024-04-18 13:13:46 +02:00
parent ecb8e0b1c3
commit d8ad2e409e
2 changed files with 57 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/Umbraco.Web.UI.Client/src/packages/core/collection/default/collection-default.context.ts
View File

@@ -51,6 +51,7 @@ export class UmbDefaultCollectionContext<
public readonly view = new UmbCollectionViewManager(this);
#defaultViewAlias: string;
#defaultFilter: Partial<FilterModelType>;
#initResolver?: () => void;
#initialized = false;
@@ -59,10 +60,11 @@ export class UmbDefaultCollectionContext<
this.#initialized ? resolve() : (this.#initResolver = resolve);
});
constructor(host: UmbControllerHost, defaultViewAlias: string) {
constructor(host: UmbControllerHost, defaultViewAlias: string, defaultFilter: Partial<FilterModelType> = {}) {
super(host, UMB_DEFAULT_COLLECTION_CONTEXT);
this.#defaultViewAlias = defaultViewAlias;
this.#defaultFilter = defaultFilter;
this.pagination.addEventListener(UmbChangeEvent.TYPE, this.#onPageChange);
}
@@ -79,6 +81,7 @@ export class UmbDefaultCollectionContext<
}
this.#filter.setValue({
...this.#defaultFilter,
...this.#config,
...this.#filter.getValue(),
skip: 0,

104
src/Umbraco.Web.UI.Client/src/packages/user/user/collection/user-collection.context.ts
View File

@@ -7,65 +7,69 @@ import type { UmbControllerHost } from '@umbraco-cms/backoffice/controller-api';
import { UmbDirectionModel } from '@umbraco-cms/backoffice/models';
import { UmbArrayState, UmbStringState } from '@umbraco-cms/backoffice/observable-api';
const orderByOptions: Array<UmbUserOrderByOption> = [
{
unique: 'nameAscending',
label: '#user_sortNameAscending',
config: {
orderBy: UmbUserOrderByModel.NAME,
orderDirection: UmbDirectionModel.ASCENDING,
},
},
{
unique: 'nameDescending',
label: '#user_sortNameDescending',
config: {
orderBy: UmbUserOrderByModel.NAME,
orderDirection: UmbDirectionModel.DESCENDING,
},
},
{
unique: 'createDateDescending',
label: '#user_sortCreateDateDescending',
config: {
orderBy: UmbUserOrderByModel.CREATE_DATE,
orderDirection: UmbDirectionModel.DESCENDING,
},
},
{
unique: 'createDateAscending',
label: '#user_sortCreateDateAscending',
config: {
orderBy: UmbUserOrderByModel.CREATE_DATE,
orderDirection: UmbDirectionModel.ASCENDING,
},
},
{
unique: 'lastLoginDateDescending',
label: '#user_sortLastLoginDateDescending',
config: {
orderBy: UmbUserOrderByModel.LAST_LOGIN_DATE,
orderDirection: UmbDirectionModel.DESCENDING,
},
},
];
export class UmbUserCollectionContext extends UmbDefaultCollectionContext<
UmbUserDetailModel,
UmbUserCollectionFilterModel
> {
#orderByOptions = new UmbArrayState<UmbUserOrderByOption>(
[
{
unique: 'nameAscending',
label: '#user_sortNameAscending',
config: {
orderBy: UmbUserOrderByModel.NAME,
orderDirection: UmbDirectionModel.ASCENDING,
},
},
{
unique: 'nameDescending',
label: '#user_sortNameDescending',
config: {
orderBy: UmbUserOrderByModel.NAME,
orderDirection: UmbDirectionModel.DESCENDING,
},
},
{
unique: 'createDateDescending',
label: '#user_sortCreateDateDescending',
config: {
orderBy: UmbUserOrderByModel.CREATE_DATE,
orderDirection: UmbDirectionModel.DESCENDING,
},
},
{
unique: 'createDateAscending',
label: '#user_sortCreateDateAscending',
config: {
orderBy: UmbUserOrderByModel.CREATE_DATE,
orderDirection: UmbDirectionModel.ASCENDING,
},
},
{
unique: 'lastLoginDateDescending',
label: '#user_sortLastLoginDateDescending',
config: {
orderBy: UmbUserOrderByModel.LAST_LOGIN_DATE,
orderDirection: UmbDirectionModel.DESCENDING,
},
},
],
(x) => x.label,
);
#orderByOptions = new UmbArrayState<UmbUserOrderByOption>([], (x) => x.label);
orderByOptions = this.#orderByOptions.asObservable();
#activeOrderByOption = new UmbStringState<string | undefined>(undefined);
activeOrderByOption = this.#activeOrderByOption.asObservable();
constructor(host: UmbControllerHost) {
super(host, UMB_COLLECTION_VIEW_USER_GRID);
// init default orderBy option
const defaultOrderByOption = this.#orderByOptions.getValue()[0];
this.setActiveOrderByOption(defaultOrderByOption.unique);
const firstOption: UmbUserOrderByOption = orderByOptions[0];
super(host, UMB_COLLECTION_VIEW_USER_GRID, {
orderBy: firstOption.config.orderBy,
orderDirection: firstOption.config.orderDirection,
});
this.#orderByOptions.setValue(orderByOptions);
this.#activeOrderByOption.setValue(firstOption.unique);
}
/**
@@ -80,8 +84,6 @@ export class UmbUserCollectionContext extends UmbDefaultCollectionContext<
this.setFilter({ orderBy: option?.config.orderBy, orderDirection: option?.config.orderDirection });
}
getActiveOrderByOption() {}
/**
* Sets the state filter for the collection and refreshes the collection.
* @param {Array<UmbUserStateFilterModel>} selection