Skip to content
Snippets Groups Projects
Commit 0ce9d34b authored by Florent POITTEVIN's avatar Florent POITTEVIN
Browse files

feat: sort dropdown person and org unit and preserve after input

parent a8cb4130
No related branches found
No related tags found
No related merge requests found
...@@ -99,7 +99,7 @@ export class DepositListRoutable extends SharedAbstractListRoutable<Deposit, Dep ...@@ -99,7 +99,7 @@ export class DepositListRoutable extends SharedAbstractListRoutable<Deposit, Dep
readonly KEY_STATUS: keyof Deposit & string = "status"; readonly KEY_STATUS: keyof Deposit & string = "status";
depositAuthorizedOrganizationalUnitSort: Sort = { depositAuthorizedOrganizationalUnitSort: Sort = {
field: "name" as keyof OrganizationalUnit, field: "name",
order: OrderEnum.ascending, order: OrderEnum.ascending,
}; };
depositAuthorizedOrganizationalUnitNameSpace: ResourceNameSpace = depositAuthorizedOrganizationalUnitNameSpace; depositAuthorizedOrganizationalUnitNameSpace: ResourceNameSpace = depositAuthorizedOrganizationalUnitNameSpace;
......
...@@ -15,6 +15,7 @@ ...@@ -15,6 +15,7 @@
solidifyValidation solidifyValidation
[resourceNameSpace]="sharedPersonActionNameSpace" [resourceNameSpace]="sharedPersonActionNameSpace"
[state]="sharedPersonState" [state]="sharedPersonState"
[sort]="sharedPersonSort"
[formControl]="fd" [formControl]="fd"
[required]="formValidationHelper.hasRequiredField(fd)" [required]="formValidationHelper.hasRequiredField(fd)"
[labelKey]="'fullName'" [labelKey]="'fullName'"
...@@ -32,6 +33,7 @@ ...@@ -32,6 +33,7 @@
solidifyValidation solidifyValidation
[resourceNameSpace]="sharedOrgUnitActionNameSpace" [resourceNameSpace]="sharedOrgUnitActionNameSpace"
[state]="sharedOrgUnitState" [state]="sharedOrgUnitState"
[sort]="sharedOrgUnitSort"
[formControl]="fd" [formControl]="fd"
[required]="formValidationHelper.hasRequiredField(fd)" [required]="formValidationHelper.hasRequiredField(fd)"
[labelKey]="'name'" [labelKey]="'name'"
......
...@@ -46,8 +46,10 @@ import { ...@@ -46,8 +46,10 @@ import {
isUndefined, isUndefined,
MARK_AS_TRANSLATABLE, MARK_AS_TRANSLATABLE,
ObservableUtil, ObservableUtil,
OrderEnum,
PropertyName, PropertyName,
ResourceNameSpace, ResourceNameSpace,
Sort,
StringUtil, StringUtil,
} from "solidify-frontend"; } from "solidify-frontend";
...@@ -85,9 +87,17 @@ export class SharedPersonOrgunitRolePresentational extends SharedAbstractPresent ...@@ -85,9 +87,17 @@ export class SharedPersonOrgunitRolePresentational extends SharedAbstractPresent
@Input() @Input()
highlightedPersonOrOrgUnitId: string; highlightedPersonOrOrgUnitId: string;
sharedPersonSort: Sort = {
field: "lastName",
order: OrderEnum.ascending,
};
sharedPersonActionNameSpace: ResourceNameSpace = sharedPersonActionNameSpace; sharedPersonActionNameSpace: ResourceNameSpace = sharedPersonActionNameSpace;
sharedPersonState: typeof SharedPersonState = SharedPersonState; sharedPersonState: typeof SharedPersonState = SharedPersonState;
sharedOrgUnitSort: Sort = {
field: "name",
order: OrderEnum.ascending,
};
sharedOrgUnitActionNameSpace: ResourceNameSpace = sharedOrgUnitActionNameSpace; sharedOrgUnitActionNameSpace: ResourceNameSpace = sharedOrgUnitActionNameSpace;
sharedOrgUnitState: typeof SharedOrganizationalUnitState = SharedOrganizationalUnitState; sharedOrgUnitState: typeof SharedOrganizationalUnitState = SharedOrganizationalUnitState;
......
...@@ -178,8 +178,7 @@ export abstract class SharedSearchableAbstractContentPresentational<TResource ex ...@@ -178,8 +178,7 @@ export abstract class SharedSearchableAbstractContentPresentational<TResource ex
debounceTime(this._debounceTime), debounceTime(this._debounceTime),
distinctUntilChanged(), distinctUntilChanged(),
tap(v => { tap(v => {
const queryParameters = new QueryParameters(); const queryParameters = new QueryParameters(this._pageSize, this.host.sort);
queryParameters.paging.pageSize = this._pageSize;
if (isNotNullNorUndefined(this.host.extraSearchQueryParam)) { if (isNotNullNorUndefined(this.host.extraSearchQueryParam)) {
queryParameters.search.searchItems = MappingObjectUtil.copy(this.host.extraSearchQueryParam); queryParameters.search.searchItems = MappingObjectUtil.copy(this.host.extraSearchQueryParam);
} }
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment