From c1ccf37d9d9e20f5944c2599b22a527b8261885e Mon Sep 17 00:00:00 2001 From: nsemets Date: Wed, 8 Oct 2025 17:42:01 +0300 Subject: [PATCH 1/4] fix(settings): fixed bug --- src/app/features/project/settings/mappers/settings.mapper.ts | 2 +- src/app/features/project/settings/models/node-details.model.ts | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/app/features/project/settings/mappers/settings.mapper.ts b/src/app/features/project/settings/mappers/settings.mapper.ts index 8737d5ea9..34f3af5a1 100644 --- a/src/app/features/project/settings/mappers/settings.mapper.ts +++ b/src/app/features/project/settings/mappers/settings.mapper.ts @@ -33,7 +33,7 @@ export class SettingsMapper { title: data.attributes.title, description: data.attributes.description, isPublic: data.attributes.public, - region: RegionsMapper.getRegion(data?.embeds?.region?.data), + region: data.embeds ? RegionsMapper.getRegion(data?.embeds?.region?.data) : null, affiliatedInstitutions: data.embeds ? InstitutionsMapper.fromInstitutionsResponse(data.embeds.affiliated_institutions) : [], diff --git a/src/app/features/project/settings/models/node-details.model.ts b/src/app/features/project/settings/models/node-details.model.ts index 6b8dd607e..1afbb872d 100644 --- a/src/app/features/project/settings/models/node-details.model.ts +++ b/src/app/features/project/settings/models/node-details.model.ts @@ -6,7 +6,7 @@ export interface NodeDetailsModel { title: string; description: string; isPublic: boolean; - region: IdName; + region: IdName | null; affiliatedInstitutions: Institution[]; currentUserPermissions: UserPermissions[]; rootId?: string; From 77e52f058b43b9e671cf924eae27f9c63b0102d8 Mon Sep 17 00:00:00 2001 From: nsemets Date: Wed, 8 Oct 2025 18:22:35 +0300 Subject: [PATCH 2/4] fix(sort): fixed sort --- src/app/shared/stores/global-search/global-search.state.ts | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/app/shared/stores/global-search/global-search.state.ts b/src/app/shared/stores/global-search/global-search.state.ts index 12201c202..a4db01970 100644 --- a/src/app/shared/stores/global-search/global-search.state.ts +++ b/src/app/shared/stores/global-search/global-search.state.ts @@ -318,7 +318,8 @@ export class GlobalSearchState { filtersParams['page[size]'] = '10'; const sortBy = state.sortBy; - const sortParam = sortBy.includes('count') && !sortBy.includes('relevance') ? 'sort[integer-value]' : 'sort'; + const sortParam = + sortBy.toLowerCase().includes('count') && !sortBy.includes('relevance') ? 'sort[integer-value]' : 'sort'; filtersParams[sortParam] = sortBy; return filtersParams; From aae7dcb9f076ed34ad6de2752bae9eb753156b5f Mon Sep 17 00:00:00 2001 From: nsemets Date: Wed, 8 Oct 2025 18:37:45 +0300 Subject: [PATCH 3/4] fix(settings): fixed bug --- src/app/features/project/settings/settings.component.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/app/features/project/settings/settings.component.html b/src/app/features/project/settings/settings.component.html index 0c2938ef0..3c1b3f8b4 100644 --- a/src/app/features/project/settings/settings.component.html +++ b/src/app/features/project/settings/settings.component.html @@ -13,7 +13,7 @@ /> From 40d363095eb2b8c852a20747899eb996e3443b19 Mon Sep 17 00:00:00 2001 From: nsemets Date: Wed, 8 Oct 2025 18:44:24 +0300 Subject: [PATCH 4/4] fix(institutions): fixed date format --- .../constants/preprints-table-columns.constant.ts | 4 ++-- .../constants/project-table-columns.constant.ts | 4 ++-- .../constants/registration-table-columns.constant.ts | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/app/features/admin-institutions/constants/preprints-table-columns.constant.ts b/src/app/features/admin-institutions/constants/preprints-table-columns.constant.ts index cbd0852b3..ec6e60c0e 100644 --- a/src/app/features/admin-institutions/constants/preprints-table-columns.constant.ts +++ b/src/app/features/admin-institutions/constants/preprints-table-columns.constant.ts @@ -17,13 +17,13 @@ export const preprintsTableColumns: TableColumn[] = [ field: 'dateCreated', header: 'adminInstitutions.projects.dateCreated', sortable: true, - dateFormat: 'dd/MM/yyyy', + dateFormat: 'MMM d, y', }, { field: 'dateModified', header: 'adminInstitutions.projects.dateModified', sortable: true, - dateFormat: 'dd/MM/yyyy', + dateFormat: 'MMM d, y', }, { field: 'doi', diff --git a/src/app/features/admin-institutions/constants/project-table-columns.constant.ts b/src/app/features/admin-institutions/constants/project-table-columns.constant.ts index 1e8820b82..894d2770d 100644 --- a/src/app/features/admin-institutions/constants/project-table-columns.constant.ts +++ b/src/app/features/admin-institutions/constants/project-table-columns.constant.ts @@ -17,13 +17,13 @@ export const projectTableColumns: TableColumn[] = [ field: 'dateCreated', header: 'adminInstitutions.projects.dateCreated', sortable: true, - dateFormat: 'dd/MM/yyyy', + dateFormat: 'MMM d, y', }, { field: 'dateModified', header: 'adminInstitutions.projects.dateModified', sortable: true, - dateFormat: 'dd/MM/yyyy', + dateFormat: 'MMM d, y', }, { field: 'doi', diff --git a/src/app/features/admin-institutions/constants/registration-table-columns.constant.ts b/src/app/features/admin-institutions/constants/registration-table-columns.constant.ts index f7ca752d5..884afb352 100644 --- a/src/app/features/admin-institutions/constants/registration-table-columns.constant.ts +++ b/src/app/features/admin-institutions/constants/registration-table-columns.constant.ts @@ -17,13 +17,13 @@ export const registrationTableColumns: TableColumn[] = [ field: 'dateCreated', header: 'adminInstitutions.projects.dateCreated', sortable: true, - dateFormat: 'dd/MM/yyyy', + dateFormat: 'MMM d, y', }, { field: 'dateModified', header: 'adminInstitutions.projects.dateModified', sortable: true, - dateFormat: 'dd/MM/yyyy', + dateFormat: 'MMM d, y', }, { field: 'doi',