From cda0d52d502103ad59d067efa5d18e7d2c5bf9f0 Mon Sep 17 00:00:00 2001
From: Florent POITTEVIN <poittevin.florent@gmail.com>
Date: Thu, 4 Jun 2020 11:28:19 +0200
Subject: [PATCH] fix: add typing on sort interface
---
package-lock.json | 6 +++---
package.json | 2 +-
.../admin-orgunit-form.presentational.ts | 8 ++++----
.../admin-person-form/admin-person-form.presentational.ts | 2 +-
.../deposit-form/deposit-form.presentational.ts | 4 ++--
.../orgunit-form/orgunit-form.presentational.ts | 2 +-
6 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/package-lock.json b/package-lock.json
index ead2cab8e..0abbf4504 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -14489,9 +14489,9 @@
}
},
"solidify-frontend": {
- "version": "0.5.6",
- "resolved": "https://nexus.unige.ch/repository/npm-all/solidify-frontend/-/solidify-frontend-0.5.6.tgz",
- "integrity": "sha512-bdKevqN9u3eSYgD35uLjbvTTDHw3M5E0+2RvMgv4dIa3OFxyRbxkhpJ/NMUSThqPIAfdlosLlJva80ILnwGUFw=="
+ "version": "0.5.8",
+ "resolved": "https://nexus.unige.ch/repository/npm-all/solidify-frontend/-/solidify-frontend-0.5.8.tgz",
+ "integrity": "sha512-bslPBi55sGZoa5e2+YLw1xfDeEdDn/4T786ih8/CRS3VTUHmiZyp77DFPDaDVYNM4HF1wph8aMp700KFX9SaUQ=="
},
"sort-keys": {
"version": "1.1.2",
diff --git a/package.json b/package.json
index 45192c1c7..2f4f43e17 100644
--- a/package.json
+++ b/package.json
@@ -89,7 +89,7 @@
"primeicons": "2.0.0",
"primeng": "9.0.2",
"rxjs": "6.5.4",
- "solidify-frontend": "0.5.6",
+ "solidify-frontend": "0.5.8",
"streamsaver": "2.0.3",
"sync-pom-version-to-package": "1.3.1",
"ts-key-enum": "2.0.2",
diff --git a/src/app/features/admin/orgunit/components/presentationals/admin-orgunit-form/admin-orgunit-form.presentational.ts b/src/app/features/admin/orgunit/components/presentationals/admin-orgunit-form/admin-orgunit-form.presentational.ts
index 2c565b400..a7991f96f 100644
--- a/src/app/features/admin/orgunit/components/presentationals/admin-orgunit-form/admin-orgunit-form.presentational.ts
+++ b/src/app/features/admin/orgunit/components/presentationals/admin-orgunit-form/admin-orgunit-form.presentational.ts
@@ -114,28 +114,28 @@ export class AdminOrgunitFormPresentational extends SharedAbstractFormPresentati
@ViewChild("licenseSingleSearchableSelect")
licenseSingleSearchableSelect: SharedSearchableSingleSelectPresentational<SharedLicenseStateModel, License>;
- sharedInstitutionSort: Sort = {
+ sharedInstitutionSort: Sort<Institution> = {
field: "name",
order: OrderEnum.ascending,
};
sharedInstitutionActionNameSpace: ResourceNameSpace = sharedInstitutionActionNameSpace;
sharedInstitutionState: typeof SharedInstitutionState = SharedInstitutionState;
- sharedFundingAgencySort: Sort = {
+ sharedFundingAgencySort: Sort<FundingAgency> = {
field: "name",
order: OrderEnum.ascending,
};
sharedFundingAgencyActionNameSpace: ResourceNameSpace = sharedFundingAgencyActionNameSpace;
sharedFundingAgencyState: typeof SharedFundingAgencyState = SharedFundingAgencyState;
- sharedResearchDomainSort: Sort = {
+ sharedResearchDomainSort: Sort<ResearchDomain> = {
field: "name",
order: OrderEnum.ascending,
};
sharedResearchDomainActionNameSpace: ResourceNameSpace = sharedResearchDomainActionNameSpace;
sharedResearchDomainState: typeof SharedResearchDomainState = SharedResearchDomainState;
- sharedLicenseSort: Sort = {
+ sharedLicenseSort: Sort<License> = {
field: "title",
order: OrderEnum.ascending,
};
diff --git a/src/app/features/admin/person/components/presentationals/admin-person-form/admin-person-form.presentational.ts b/src/app/features/admin/person/components/presentationals/admin-person-form/admin-person-form.presentational.ts
index 575f0fe07..b3798cdb2 100644
--- a/src/app/features/admin/person/components/presentationals/admin-person-form/admin-person-form.presentational.ts
+++ b/src/app/features/admin/person/components/presentationals/admin-person-form/admin-person-form.presentational.ts
@@ -50,7 +50,7 @@ export class AdminPersonFormPresentational extends SharedAbstractFormPresentatio
@Input()
listRole: Role[];
- sharedInstitutionSort: Sort = {
+ sharedInstitutionSort: Sort<Institution> = {
field: "name",
order: OrderEnum.ascending,
};
diff --git a/src/app/features/deposit/components/presentationals/deposit-form/deposit-form.presentational.ts b/src/app/features/deposit/components/presentationals/deposit-form/deposit-form.presentational.ts
index 498b6e1e2..f5f49bdf9 100644
--- a/src/app/features/deposit/components/presentationals/deposit-form/deposit-form.presentational.ts
+++ b/src/app/features/deposit/components/presentationals/deposit-form/deposit-form.presentational.ts
@@ -144,14 +144,14 @@ export class DepositFormPresentational extends SharedAbstractFormPresentational<
return ApplicationRoleEnum;
}
- sharedPersonSort: Sort = {
+ sharedPersonSort: Sort<Person> = {
field: "lastName",
order: OrderEnum.ascending,
};
sharedPersonActionNameSpace: ResourceNameSpace = sharedPersonActionNameSpace;
sharedPersonState: typeof SharedPersonState = SharedPersonState;
- sharedLicenseSort: Sort = {
+ sharedLicenseSort: Sort<License> = {
field: "title",
order: OrderEnum.ascending,
};
diff --git a/src/app/features/preservation-space/organizational-unit/components/presentationals/orgunit-form/orgunit-form.presentational.ts b/src/app/features/preservation-space/organizational-unit/components/presentationals/orgunit-form/orgunit-form.presentational.ts
index df5faea9a..a19cfc819 100644
--- a/src/app/features/preservation-space/organizational-unit/components/presentationals/orgunit-form/orgunit-form.presentational.ts
+++ b/src/app/features/preservation-space/organizational-unit/components/presentationals/orgunit-form/orgunit-form.presentational.ts
@@ -93,7 +93,7 @@ export class OrgunitFormPresentational extends SharedAbstractFormPresentational<
@Output("requestToBeMemberChange")
readonly requestToBeMemberObs: Observable<void> = ObservableUtil.asObservable(this._requestToBeMemberBS);
- sharedResearchDomainSort: Sort = {
+ sharedResearchDomainSort: Sort<ResearchDomain> = {
field: "name",
order: OrderEnum.ascending,
};
--
GitLab