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

fix: sort org unit list by name on deposit and fix infinite load

parent a74ae06b
No related branches found
No related tags found
No related merge requests found
......@@ -44,6 +44,7 @@
solidifyValidation
[resourceNameSpace]="depositAuthorizedOrganizationalUnitNameSpace"
[state]="depositAuthorizedOrganizationalUnitState"
[sort]="depositAuthorizedOrganizationalUnitSort"
[formControl]="fd"
[canDeleteValue]="false"
[labelKey]="'name'"
......
......@@ -70,6 +70,7 @@ import {
isNullOrUndefined,
isUndefined,
MappingObjectUtil,
MARK_AS_TRANSLATABLE,
MemoizedUtil,
OrderEnum,
Override,
......@@ -79,7 +80,7 @@ import {
ResourceNameSpace,
ResourceState,
SolidifyValidator,
MARK_AS_TRANSLATABLE,
Sort,
} from "solidify-frontend";
@Component({
......@@ -97,6 +98,10 @@ export class DepositListRoutable extends SharedAbstractListRoutable<Deposit, Dep
readonly KEY_ORGANIZATIONAL_UNIT: keyof Deposit & string = "organizationalUnitId";
readonly KEY_STATUS: keyof Deposit & string = "status";
depositAuthorizedOrganizationalUnitSort: Sort = {
field: "name" as keyof OrganizationalUnit,
order: OrderEnum.ascending,
};
depositAuthorizedOrganizationalUnitNameSpace: ResourceNameSpace = depositAuthorizedOrganizationalUnitNameSpace;
depositAuthorizedOrganizationalUnitState: typeof DepositAuthorizedOrganizationalUnitState = DepositAuthorizedOrganizationalUnitState;
......
......@@ -14,6 +14,7 @@ import {
defaultResourceStateInitValue,
MappingObjectUtil,
NotificationService,
OrderEnum,
QueryParameters,
ResourceState,
ResourceStateModel,
......@@ -30,7 +31,10 @@ export const defaultDepositAuthorizedOrgUnitValue: () => DepositAuthorizedOrgani
// WARNING : IN SOME CASE WE NEED TO FILTER TO GET ONLY OPENED ORG UNIT
const getQueryParameter = () => {
const queryParameters = new QueryParameters(environment.defaultEnumValuePageSizeLazyLoad);
const queryParameters = new QueryParameters(environment.defaultEnumValuePageSizeLazyLoad, {
field: "name" as keyof OrganizationalUnit,
order: OrderEnum.ascending,
});
MappingObjectUtil.set(queryParameters.search.searchItems, "openOnly", "true");
return queryParameters;
};
......
......@@ -66,7 +66,8 @@ export abstract class SharedSearchableAbstractContentPresentational<TResource ex
}
const currentPosition = this._elementRef.nativeElement.scrollTop + this._elementRef.nativeElement.offsetHeight;
const maxPosition = this._elementRef.nativeElement.scrollHeight;
if (currentPosition === maxPosition) {
if (currentPosition >= maxPosition) {
this.loadNextChunk();
}
}
......@@ -158,7 +159,7 @@ export abstract class SharedSearchableAbstractContentPresentational<TResource ex
}
private _dispatchInitDataLoad(): void {
const queryParameters = new QueryParameters(this._pageSize);
const queryParameters = new QueryParameters(this._pageSize, this.host.sort);
if (isNotNullNorUndefined(this.host.extraSearchQueryParam)) {
queryParameters.search.searchItems = MappingObjectUtil.copy(this.host.extraSearchQueryParam);
}
......
......@@ -39,6 +39,7 @@ import {
ResourceNameSpace,
ResourceState,
ResourceStateModel,
Sort,
Type,
} from "solidify-frontend";
......@@ -68,6 +69,9 @@ export class SharedSearchableMultiSelectPresentational<TStateModel extends Resou
@Input()
searchKey: string;
@Input()
sort: Sort | undefined;
@ViewChild("inputElementRef", {static: true})
inputElementRef: ElementRef;
......
......@@ -57,6 +57,7 @@ import {
ResourceNameSpace,
ResourceState,
ResourceStateModel,
Sort,
Type,
} from "solidify-frontend";
......@@ -124,6 +125,9 @@ export class SharedSearchableSingleSelectPresentational<TStateModel extends Reso
@Input()
defaultValue: string | undefined;
@Input()
sort: Sort | undefined;
isDefaultValueSelected: boolean = false;
private url: string;
......
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