From 8949e7cc270f499c446c65550bc1243c2f0ce4f3 Mon Sep 17 00:00:00 2001
From: Adan Roman <aroman@arvo.es>
Date: Tue, 20 Dec 2022 15:42:56 +0100
Subject: [PATCH 1/9] DS-8408 - In Advanced Search, list collections
 alphabetically

---
 .../dso-selector/dso-selector/dso-selector.component.ts  | 9 ++++++++-
 .../create-community-parent-selector.component.html      | 2 +-
 .../create-community-parent-selector.component.ts        | 6 ++++++
 .../dso-selector-modal-wrapper.component.html            | 2 +-
 .../dso-selector-modal-wrapper.component.ts              | 6 ++++++
 .../scope-selector-modal.component.html                  | 2 +-
 .../scope-selector-modal.component.ts                    | 7 ++++++-
 .../create-collection-parent-selector.component.html     | 2 +-
 .../create-community-parent-selector.component.html      | 2 +-
 .../edit-collection-selector.component.html              | 2 +-
 .../edit-community-selector.component.html               | 2 +-
 .../edit-item-selector/edit-item-selector.component.html | 2 +-
 12 files changed, 34 insertions(+), 10 deletions(-)

diff --git a/src/app/shared/dso-selector/dso-selector/dso-selector.component.ts b/src/app/shared/dso-selector/dso-selector/dso-selector.component.ts
index 0c799369ef..087ef3216d 100644
--- a/src/app/shared/dso-selector/dso-selector/dso-selector.component.ts
+++ b/src/app/shared/dso-selector/dso-selector/dso-selector.component.ts
@@ -31,6 +31,7 @@ import { getFirstCompletedRemoteData, getFirstSucceededRemoteDataPayload } from
 import { hasNoValue, hasValue, isEmpty, isNotEmpty } from '../../empty.util';
 import { buildPaginatedList, PaginatedList } from '../../../core/data/paginated-list.model';
 import { SearchResult } from '../../search/models/search-result.model';
+import {SortDirection, SortOptions} from '../../../core/cache/models/sort-options.model';
 import { RemoteData } from '../../../core/data/remote-data';
 import { NotificationsService } from '../../notifications/notifications.service';
 import { TranslateService } from '@ngx-translate/core';
@@ -61,6 +62,11 @@ export class DSOSelectorComponent implements OnInit, OnDestroy {
    */
   @Input() types: DSpaceObjectType[];
 
+   /**
+   * The sorting options
+   */
+  @Input() sort: SortOptions;
+
   // list of allowed selectable dsoTypes
   typesString: string;
 
@@ -219,7 +225,8 @@ export class DSOSelectorComponent implements OnInit, OnDestroy {
         dsoTypes: this.types,
         pagination: Object.assign({}, this.defaultPagination, {
           currentPage: page
-        })
+        }),
+        sort: this.sort
       })
     ).pipe(
       getFirstCompletedRemoteData()
diff --git a/src/app/shared/dso-selector/modal-wrappers/create-community-parent-selector/create-community-parent-selector.component.html b/src/app/shared/dso-selector/modal-wrappers/create-community-parent-selector/create-community-parent-selector.component.html
index 84fdd34c01..2ec9a4f5ab 100644
--- a/src/app/shared/dso-selector/modal-wrappers/create-community-parent-selector/create-community-parent-selector.component.html
+++ b/src/app/shared/dso-selector/modal-wrappers/create-community-parent-selector/create-community-parent-selector.component.html
@@ -14,6 +14,6 @@
         </h3>
 
         <h5 class="px-2">{{'dso-selector.create.community.sub-level' | translate}}</h5>
-        <ds-dso-selector [currentDSOId]="dsoRD?.payload.uuid" [types]="selectorTypes" (onSelect)="selectObject($event)"></ds-dso-selector>
+        <ds-dso-selector [currentDSOId]="dsoRD?.payload.uuid" [types]="selectorTypes" [sort]="defaultSort" (onSelect)="selectObject($event)"></ds-dso-selector>
     </div>
 </div>
diff --git a/src/app/shared/dso-selector/modal-wrappers/create-community-parent-selector/create-community-parent-selector.component.ts b/src/app/shared/dso-selector/modal-wrappers/create-community-parent-selector/create-community-parent-selector.component.ts
index a7f583df50..f344c1c3f3 100644
--- a/src/app/shared/dso-selector/modal-wrappers/create-community-parent-selector/create-community-parent-selector.component.ts
+++ b/src/app/shared/dso-selector/modal-wrappers/create-community-parent-selector/create-community-parent-selector.component.ts
@@ -12,6 +12,7 @@ import {
     getCommunityCreateRoute,
     COMMUNITY_PARENT_PARAMETER
 } from '../../../../community-page/community-page-routing-paths';
+import {SortDirection, SortOptions} from '../../../../core/cache/models/sort-options.model';
 
 /**
  * Component to wrap a button - for top communities -
@@ -30,6 +31,11 @@ export class CreateCommunityParentSelectorComponent extends DSOSelectorModalWrap
   selectorTypes = [DSpaceObjectType.COMMUNITY];
   action = SelectorActionType.CREATE;
 
+  /**
+   * Default DSO ordering
+   */
+  defaultSort = new SortOptions('dc.title', SortDirection.ASC);
+
   constructor(protected activeModal: NgbActiveModal, protected route: ActivatedRoute, private router: Router) {
     super(activeModal, route);
   }
diff --git a/src/app/shared/dso-selector/modal-wrappers/dso-selector-modal-wrapper.component.html b/src/app/shared/dso-selector/modal-wrappers/dso-selector-modal-wrapper.component.html
index 85d8797e66..54044f5d79 100644
--- a/src/app/shared/dso-selector/modal-wrappers/dso-selector-modal-wrapper.component.html
+++ b/src/app/shared/dso-selector/modal-wrappers/dso-selector-modal-wrapper.component.html
@@ -6,6 +6,6 @@
   </div>
   <div class="modal-body">
     <h5 *ngIf="header" class="px-2">{{header | translate}}</h5>
-    <ds-dso-selector [currentDSOId]="dsoRD?.payload.uuid" [types]="selectorTypes" (onSelect)="selectObject($event)"></ds-dso-selector>
+    <ds-dso-selector [currentDSOId]="dsoRD?.payload.uuid" [types]="selectorTypes" [sort]="defaultSort" (onSelect)="selectObject($event)"></ds-dso-selector>
   </div>
 </div>
diff --git a/src/app/shared/dso-selector/modal-wrappers/dso-selector-modal-wrapper.component.ts b/src/app/shared/dso-selector/modal-wrappers/dso-selector-modal-wrapper.component.ts
index 113ca518fd..2a25da2f72 100644
--- a/src/app/shared/dso-selector/modal-wrappers/dso-selector-modal-wrapper.component.ts
+++ b/src/app/shared/dso-selector/modal-wrappers/dso-selector-modal-wrapper.component.ts
@@ -5,6 +5,7 @@ import { RemoteData } from '../../../core/data/remote-data';
 import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap';
 import { DSpaceObjectType } from '../../../core/shared/dspace-object-type.model';
 import { hasValue, isNotEmpty } from '../../empty.util';
+import {SortDirection, SortOptions} from '../../../core/cache/models/sort-options.model';
 
 export enum SelectorActionType {
   CREATE = 'create',
@@ -49,6 +50,11 @@ export abstract class DSOSelectorModalWrapperComponent implements OnInit {
    */
   action: SelectorActionType;
 
+  /**
+   * Default DSO ordering
+   */
+  defaultSort = new SortOptions('dc.title', SortDirection.ASC);
+
   constructor(protected activeModal: NgbActiveModal, protected route: ActivatedRoute) {
   }
 
diff --git a/src/app/shared/search-form/scope-selector-modal/scope-selector-modal.component.html b/src/app/shared/search-form/scope-selector-modal/scope-selector-modal.component.html
index bf5c15e963..ad360be677 100644
--- a/src/app/shared/search-form/scope-selector-modal/scope-selector-modal.component.html
+++ b/src/app/shared/search-form/scope-selector-modal/scope-selector-modal.component.html
@@ -14,6 +14,6 @@
         </h3>
 
         <h5 class="px-2">{{'dso-selector.' + action + '.' + objectType.toString().toLowerCase() + '.input-header' | translate}}</h5>
-        <ds-dso-selector [currentDSOId]="dsoRD?.payload.uuid" [types]="selectorTypes" (onSelect)="selectObject($event)"></ds-dso-selector>
+        <ds-dso-selector [currentDSOId]="dsoRD?.payload.uuid" [types]="selectorTypes" [sort]="defaultSort" (onSelect)="selectObject($event)"></ds-dso-selector>
     </div>
 </div>
diff --git a/src/app/shared/search-form/scope-selector-modal/scope-selector-modal.component.ts b/src/app/shared/search-form/scope-selector-modal/scope-selector-modal.component.ts
index 86c3010287..416242520c 100644
--- a/src/app/shared/search-form/scope-selector-modal/scope-selector-modal.component.ts
+++ b/src/app/shared/search-form/scope-selector-modal/scope-selector-modal.component.ts
@@ -4,7 +4,7 @@ import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap';
 import { DSpaceObjectType } from '../../../core/shared/dspace-object-type.model';
 import { DSOSelectorModalWrapperComponent, SelectorActionType } from '../../dso-selector/modal-wrappers/dso-selector-modal-wrapper.component';
 import { DSpaceObject } from '../../../core/shared/dspace-object.model';
-
+import {SortDirection, SortOptions} from '../../../core/cache/models/sort-options.model';
 /**
  * Component to wrap a button - to select the entire repository -
  * and a list of parent communities - for scope selection
@@ -33,6 +33,11 @@ export class ScopeSelectorModalComponent extends DSOSelectorModalWrapperComponen
    */
   scopeChange = new EventEmitter<DSpaceObject>();
 
+  /**
+   * Default DSO ordering
+   */
+  defaultSort = new SortOptions('dc.title', SortDirection.ASC);
+
   constructor(protected activeModal: NgbActiveModal, protected route: ActivatedRoute) {
     super(activeModal, route);
   }
diff --git a/src/themes/custom/app/shared/dso-selector/modal-wrappers/create-collection-parent-selector/create-collection-parent-selector.component.html b/src/themes/custom/app/shared/dso-selector/modal-wrappers/create-collection-parent-selector/create-collection-parent-selector.component.html
index 85d8797e66..54044f5d79 100644
--- a/src/themes/custom/app/shared/dso-selector/modal-wrappers/create-collection-parent-selector/create-collection-parent-selector.component.html
+++ b/src/themes/custom/app/shared/dso-selector/modal-wrappers/create-collection-parent-selector/create-collection-parent-selector.component.html
@@ -6,6 +6,6 @@
   </div>
   <div class="modal-body">
     <h5 *ngIf="header" class="px-2">{{header | translate}}</h5>
-    <ds-dso-selector [currentDSOId]="dsoRD?.payload.uuid" [types]="selectorTypes" (onSelect)="selectObject($event)"></ds-dso-selector>
+    <ds-dso-selector [currentDSOId]="dsoRD?.payload.uuid" [types]="selectorTypes" [sort]="defaultSort" (onSelect)="selectObject($event)"></ds-dso-selector>
   </div>
 </div>
diff --git a/src/themes/custom/app/shared/dso-selector/modal-wrappers/create-community-parent-selector/create-community-parent-selector.component.html b/src/themes/custom/app/shared/dso-selector/modal-wrappers/create-community-parent-selector/create-community-parent-selector.component.html
index 84fdd34c01..2ec9a4f5ab 100644
--- a/src/themes/custom/app/shared/dso-selector/modal-wrappers/create-community-parent-selector/create-community-parent-selector.component.html
+++ b/src/themes/custom/app/shared/dso-selector/modal-wrappers/create-community-parent-selector/create-community-parent-selector.component.html
@@ -14,6 +14,6 @@
         </h3>
 
         <h5 class="px-2">{{'dso-selector.create.community.sub-level' | translate}}</h5>
-        <ds-dso-selector [currentDSOId]="dsoRD?.payload.uuid" [types]="selectorTypes" (onSelect)="selectObject($event)"></ds-dso-selector>
+        <ds-dso-selector [currentDSOId]="dsoRD?.payload.uuid" [types]="selectorTypes" [sort]="defaultSort" (onSelect)="selectObject($event)"></ds-dso-selector>
     </div>
 </div>
diff --git a/src/themes/custom/app/shared/dso-selector/modal-wrappers/edit-collection-selector/edit-collection-selector.component.html b/src/themes/custom/app/shared/dso-selector/modal-wrappers/edit-collection-selector/edit-collection-selector.component.html
index 85d8797e66..54044f5d79 100644
--- a/src/themes/custom/app/shared/dso-selector/modal-wrappers/edit-collection-selector/edit-collection-selector.component.html
+++ b/src/themes/custom/app/shared/dso-selector/modal-wrappers/edit-collection-selector/edit-collection-selector.component.html
@@ -6,6 +6,6 @@
   </div>
   <div class="modal-body">
     <h5 *ngIf="header" class="px-2">{{header | translate}}</h5>
-    <ds-dso-selector [currentDSOId]="dsoRD?.payload.uuid" [types]="selectorTypes" (onSelect)="selectObject($event)"></ds-dso-selector>
+    <ds-dso-selector [currentDSOId]="dsoRD?.payload.uuid" [types]="selectorTypes" [sort]="defaultSort" (onSelect)="selectObject($event)"></ds-dso-selector>
   </div>
 </div>
diff --git a/src/themes/custom/app/shared/dso-selector/modal-wrappers/edit-community-selector/edit-community-selector.component.html b/src/themes/custom/app/shared/dso-selector/modal-wrappers/edit-community-selector/edit-community-selector.component.html
index 85d8797e66..54044f5d79 100644
--- a/src/themes/custom/app/shared/dso-selector/modal-wrappers/edit-community-selector/edit-community-selector.component.html
+++ b/src/themes/custom/app/shared/dso-selector/modal-wrappers/edit-community-selector/edit-community-selector.component.html
@@ -6,6 +6,6 @@
   </div>
   <div class="modal-body">
     <h5 *ngIf="header" class="px-2">{{header | translate}}</h5>
-    <ds-dso-selector [currentDSOId]="dsoRD?.payload.uuid" [types]="selectorTypes" (onSelect)="selectObject($event)"></ds-dso-selector>
+    <ds-dso-selector [currentDSOId]="dsoRD?.payload.uuid" [types]="selectorTypes" [sort]="defaultSort" (onSelect)="selectObject($event)"></ds-dso-selector>
   </div>
 </div>
diff --git a/src/themes/custom/app/shared/dso-selector/modal-wrappers/edit-item-selector/edit-item-selector.component.html b/src/themes/custom/app/shared/dso-selector/modal-wrappers/edit-item-selector/edit-item-selector.component.html
index 85d8797e66..54044f5d79 100644
--- a/src/themes/custom/app/shared/dso-selector/modal-wrappers/edit-item-selector/edit-item-selector.component.html
+++ b/src/themes/custom/app/shared/dso-selector/modal-wrappers/edit-item-selector/edit-item-selector.component.html
@@ -6,6 +6,6 @@
   </div>
   <div class="modal-body">
     <h5 *ngIf="header" class="px-2">{{header | translate}}</h5>
-    <ds-dso-selector [currentDSOId]="dsoRD?.payload.uuid" [types]="selectorTypes" (onSelect)="selectObject($event)"></ds-dso-selector>
+    <ds-dso-selector [currentDSOId]="dsoRD?.payload.uuid" [types]="selectorTypes" [sort]="defaultSort" (onSelect)="selectObject($event)"></ds-dso-selector>
   </div>
 </div>

From d6402fbaf80e309de6e600caf9cfc8714f7db2e3 Mon Sep 17 00:00:00 2001
From: Adan Roman <aroman@arvo.es>
Date: Wed, 21 Dec 2022 08:31:42 +0100
Subject: [PATCH 2/9] DS-8408 - Unused dependency

---
 .../shared/dso-selector/dso-selector/dso-selector.component.ts  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/app/shared/dso-selector/dso-selector/dso-selector.component.ts b/src/app/shared/dso-selector/dso-selector/dso-selector.component.ts
index 3900de8571..4b5d8c7614 100644
--- a/src/app/shared/dso-selector/dso-selector/dso-selector.component.ts
+++ b/src/app/shared/dso-selector/dso-selector/dso-selector.component.ts
@@ -31,7 +31,7 @@ import { getFirstCompletedRemoteData, getFirstSucceededRemoteDataPayload } from
 import { hasNoValue, hasValue, isEmpty, isNotEmpty } from '../../empty.util';
 import { buildPaginatedList, PaginatedList } from '../../../core/data/paginated-list.model';
 import { SearchResult } from '../../search/models/search-result.model';
-import {SortDirection, SortOptions} from '../../../core/cache/models/sort-options.model';
+import { SortOptions } from '../../../core/cache/models/sort-options.model';
 import { RemoteData } from '../../../core/data/remote-data';
 import { NotificationsService } from '../../notifications/notifications.service';
 import { TranslateService } from '@ngx-translate/core';

From 6523b029134db91a449d17085dcb58b79e335f21 Mon Sep 17 00:00:00 2001
From: aroman-arvo <aroman@arvo.es>
Date: Mon, 16 Jan 2023 13:07:19 +0100
Subject: [PATCH 3/9] DS-8408: Edit item is ordered by relevance

---
 .../edit-item-selector.component.html                 | 11 +++++++++++
 .../edit-item-selector.component.ts                   |  2 +-
 .../edit-item-selector.component.html                 |  2 +-
 3 files changed, 13 insertions(+), 2 deletions(-)
 create mode 100644 src/app/shared/dso-selector/modal-wrappers/edit-item-selector/edit-item-selector.component.html

diff --git a/src/app/shared/dso-selector/modal-wrappers/edit-item-selector/edit-item-selector.component.html b/src/app/shared/dso-selector/modal-wrappers/edit-item-selector/edit-item-selector.component.html
new file mode 100644
index 0000000000..85d8797e66
--- /dev/null
+++ b/src/app/shared/dso-selector/modal-wrappers/edit-item-selector/edit-item-selector.component.html
@@ -0,0 +1,11 @@
+<div>
+  <div class="modal-header">{{'dso-selector.'+ action + '.' + objectType.toString().toLowerCase() + '.head' | translate}}
+    <button type="button" class="close" (click)="close()" aria-label="Close">
+      <span aria-hidden="true">×</span>
+    </button>
+  </div>
+  <div class="modal-body">
+    <h5 *ngIf="header" class="px-2">{{header | translate}}</h5>
+    <ds-dso-selector [currentDSOId]="dsoRD?.payload.uuid" [types]="selectorTypes" (onSelect)="selectObject($event)"></ds-dso-selector>
+  </div>
+</div>
diff --git a/src/app/shared/dso-selector/modal-wrappers/edit-item-selector/edit-item-selector.component.ts b/src/app/shared/dso-selector/modal-wrappers/edit-item-selector/edit-item-selector.component.ts
index 4822849e4c..c1ae583908 100644
--- a/src/app/shared/dso-selector/modal-wrappers/edit-item-selector/edit-item-selector.component.ts
+++ b/src/app/shared/dso-selector/modal-wrappers/edit-item-selector/edit-item-selector.component.ts
@@ -14,7 +14,7 @@ import { Item } from '../../../../core/shared/item.model';
 
 @Component({
   selector: 'ds-edit-item-selector',
-  templateUrl: '../dso-selector-modal-wrapper.component.html',
+  templateUrl: 'edit-item-selector.component.html',
 })
 export class EditItemSelectorComponent extends DSOSelectorModalWrapperComponent implements OnInit {
   objectType = DSpaceObjectType.ITEM;
diff --git a/src/themes/custom/app/shared/dso-selector/modal-wrappers/edit-item-selector/edit-item-selector.component.html b/src/themes/custom/app/shared/dso-selector/modal-wrappers/edit-item-selector/edit-item-selector.component.html
index 54044f5d79..85d8797e66 100644
--- a/src/themes/custom/app/shared/dso-selector/modal-wrappers/edit-item-selector/edit-item-selector.component.html
+++ b/src/themes/custom/app/shared/dso-selector/modal-wrappers/edit-item-selector/edit-item-selector.component.html
@@ -6,6 +6,6 @@
   </div>
   <div class="modal-body">
     <h5 *ngIf="header" class="px-2">{{header | translate}}</h5>
-    <ds-dso-selector [currentDSOId]="dsoRD?.payload.uuid" [types]="selectorTypes" [sort]="defaultSort" (onSelect)="selectObject($event)"></ds-dso-selector>
+    <ds-dso-selector [currentDSOId]="dsoRD?.payload.uuid" [types]="selectorTypes" (onSelect)="selectObject($event)"></ds-dso-selector>
   </div>
 </div>

From eeda26e122859bfac8fcbc6ea806eae86c19431e Mon Sep 17 00:00:00 2001
From: aroman-arvo <aroman@arvo.es>
Date: Mon, 13 Feb 2023 10:42:56 +0100
Subject: [PATCH 4/9] 8408 - sort ordering is parametrized and used only when
 no text query is send.

---
 config/config.example.yml                          |  5 +++++
 config/config.yml                                  |  6 +++---
 .../dso-selector/dso-selector.component.ts         |  4 +++-
 .../create-community-parent-selector.component.ts  |  6 ------
 .../dso-selector-modal-wrapper.component.ts        |  5 +++--
 .../scope-selector-modal.component.ts              |  7 +------
 src/config/app-config.interface.ts                 |  2 ++
 src/config/default-app-config.ts                   |  7 +++++++
 src/config/discovery-sort.config.ts                | 14 ++++++++++++++
 src/environments/environment.test.ts               |  4 ++++
 10 files changed, 42 insertions(+), 18 deletions(-)
 create mode 100644 src/config/discovery-sort.config.ts

diff --git a/config/config.example.yml b/config/config.example.yml
index 9abf167b90..c5a9ea6f85 100644
--- a/config/config.example.yml
+++ b/config/config.example.yml
@@ -310,3 +310,8 @@ info:
 markdown:
   enabled: false
   mathjax: false
+
+# Default collection/community sorting order at Advanced search, Create/update community and collection when there are not a query. 
+collectionSelectionSort:
+  sortMetadata: "dc.title"
+  sortDirection: "ASC"
\ No newline at end of file
diff --git a/config/config.yml b/config/config.yml
index b5eecd112f..38ac562b15 100644
--- a/config/config.yml
+++ b/config/config.yml
@@ -1,5 +1,5 @@
 rest:
-  ssl: true
-  host: api7.dspace.org
-  port: 443
+  ssl: false
+  host: localhost
+  port: 9090
   nameSpace: /server
diff --git a/src/app/shared/dso-selector/dso-selector/dso-selector.component.ts b/src/app/shared/dso-selector/dso-selector/dso-selector.component.ts
index 4b5d8c7614..52ca9224b1 100644
--- a/src/app/shared/dso-selector/dso-selector/dso-selector.component.ts
+++ b/src/app/shared/dso-selector/dso-selector/dso-selector.component.ts
@@ -227,6 +227,8 @@ export class DSOSelectorComponent implements OnInit, OnDestroy {
    * @param useCache Whether or not to use the cache
    */
   search(query: string, page: number, useCache: boolean = true): Observable<RemoteData<PaginatedList<SearchResult<DSpaceObject>>>> {
+    // default sort is only used when there is not query
+    var efectiveSort=query?null:this.sort;
     return this.searchService.search(
       new PaginatedSearchOptions({
         query: query,
@@ -234,7 +236,7 @@ export class DSOSelectorComponent implements OnInit, OnDestroy {
         pagination: Object.assign({}, this.defaultPagination, {
           currentPage: page
         }),
-        sort: this.sort
+        sort: efectiveSort
       }),
       null,
       useCache,
diff --git a/src/app/shared/dso-selector/modal-wrappers/create-community-parent-selector/create-community-parent-selector.component.ts b/src/app/shared/dso-selector/modal-wrappers/create-community-parent-selector/create-community-parent-selector.component.ts
index f344c1c3f3..a7f583df50 100644
--- a/src/app/shared/dso-selector/modal-wrappers/create-community-parent-selector/create-community-parent-selector.component.ts
+++ b/src/app/shared/dso-selector/modal-wrappers/create-community-parent-selector/create-community-parent-selector.component.ts
@@ -12,7 +12,6 @@ import {
     getCommunityCreateRoute,
     COMMUNITY_PARENT_PARAMETER
 } from '../../../../community-page/community-page-routing-paths';
-import {SortDirection, SortOptions} from '../../../../core/cache/models/sort-options.model';
 
 /**
  * Component to wrap a button - for top communities -
@@ -31,11 +30,6 @@ export class CreateCommunityParentSelectorComponent extends DSOSelectorModalWrap
   selectorTypes = [DSpaceObjectType.COMMUNITY];
   action = SelectorActionType.CREATE;
 
-  /**
-   * Default DSO ordering
-   */
-  defaultSort = new SortOptions('dc.title', SortDirection.ASC);
-
   constructor(protected activeModal: NgbActiveModal, protected route: ActivatedRoute, private router: Router) {
     super(activeModal, route);
   }
diff --git a/src/app/shared/dso-selector/modal-wrappers/dso-selector-modal-wrapper.component.ts b/src/app/shared/dso-selector/modal-wrappers/dso-selector-modal-wrapper.component.ts
index 2a25da2f72..fcb8aea9d2 100644
--- a/src/app/shared/dso-selector/modal-wrappers/dso-selector-modal-wrapper.component.ts
+++ b/src/app/shared/dso-selector/modal-wrappers/dso-selector-modal-wrapper.component.ts
@@ -5,7 +5,8 @@ import { RemoteData } from '../../../core/data/remote-data';
 import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap';
 import { DSpaceObjectType } from '../../../core/shared/dspace-object-type.model';
 import { hasValue, isNotEmpty } from '../../empty.util';
-import {SortDirection, SortOptions} from '../../../core/cache/models/sort-options.model';
+import { SortDirection, SortOptions } from '../../../core/cache/models/sort-options.model';
+import { environment } from '../../../../environments/environment';
 
 export enum SelectorActionType {
   CREATE = 'create',
@@ -53,7 +54,7 @@ export abstract class DSOSelectorModalWrapperComponent implements OnInit {
   /**
    * Default DSO ordering
    */
-  defaultSort = new SortOptions('dc.title', SortDirection.ASC);
+  defaultSort = new SortOptions(environment.collectionSelectionSort.sortMetadata, environment.collectionSelectionSort.sortDirection as SortDirection);
 
   constructor(protected activeModal: NgbActiveModal, protected route: ActivatedRoute) {
   }
diff --git a/src/app/shared/search-form/scope-selector-modal/scope-selector-modal.component.ts b/src/app/shared/search-form/scope-selector-modal/scope-selector-modal.component.ts
index 416242520c..86c3010287 100644
--- a/src/app/shared/search-form/scope-selector-modal/scope-selector-modal.component.ts
+++ b/src/app/shared/search-form/scope-selector-modal/scope-selector-modal.component.ts
@@ -4,7 +4,7 @@ import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap';
 import { DSpaceObjectType } from '../../../core/shared/dspace-object-type.model';
 import { DSOSelectorModalWrapperComponent, SelectorActionType } from '../../dso-selector/modal-wrappers/dso-selector-modal-wrapper.component';
 import { DSpaceObject } from '../../../core/shared/dspace-object.model';
-import {SortDirection, SortOptions} from '../../../core/cache/models/sort-options.model';
+
 /**
  * Component to wrap a button - to select the entire repository -
  * and a list of parent communities - for scope selection
@@ -33,11 +33,6 @@ export class ScopeSelectorModalComponent extends DSOSelectorModalWrapperComponen
    */
   scopeChange = new EventEmitter<DSpaceObject>();
 
-  /**
-   * Default DSO ordering
-   */
-  defaultSort = new SortOptions('dc.title', SortDirection.ASC);
-
   constructor(protected activeModal: NgbActiveModal, protected route: ActivatedRoute) {
     super(activeModal, route);
   }
diff --git a/src/config/app-config.interface.ts b/src/config/app-config.interface.ts
index ce9c8b3bf7..cc7227d11e 100644
--- a/src/config/app-config.interface.ts
+++ b/src/config/app-config.interface.ts
@@ -20,6 +20,7 @@ import { InfoConfig } from './info-config.interface';
 import { CommunityListConfig } from './community-list-config.interface';
 import { HomeConfig } from './homepage-config.interface';
 import { MarkdownConfig } from './markdown-config.interface';
+import { DiscoverySortConfig } from './discovery-sort.config';
 
 interface AppConfig extends Config {
   ui: UIServerConfig;
@@ -44,6 +45,7 @@ interface AppConfig extends Config {
   actuators: ActuatorsConfig
   info: InfoConfig;
   markdown: MarkdownConfig;
+  collectionSelectionSort: DiscoverySortConfig;
 }
 
 /**
diff --git a/src/config/default-app-config.ts b/src/config/default-app-config.ts
index 276d2d7150..572f757f86 100644
--- a/src/config/default-app-config.ts
+++ b/src/config/default-app-config.ts
@@ -20,6 +20,7 @@ import { InfoConfig } from './info-config.interface';
 import { CommunityListConfig } from './community-list-config.interface';
 import { HomeConfig } from './homepage-config.interface';
 import { MarkdownConfig } from './markdown-config.interface';
+import { DiscoverySortConfig } from './discovery-sort.config';
 
 export class DefaultAppConfig implements AppConfig {
   production = false;
@@ -385,4 +386,10 @@ export class DefaultAppConfig implements AppConfig {
     enabled: false,
     mathjax: false,
   };
+
+  // Configuration that determines the metadata sorting of community and collection edition and creation when there are not a search query.
+  collectionSelectionSort: DiscoverySortConfig = {
+    sortMetadata:"dc.title",
+    sortDirection:"ASC",
+  };
 }
diff --git a/src/config/discovery-sort.config.ts b/src/config/discovery-sort.config.ts
new file mode 100644
index 0000000000..02428f70a8
--- /dev/null
+++ b/src/config/discovery-sort.config.ts
@@ -0,0 +1,14 @@
+import { Config } from './config.interface';
+
+/**
+ * Config that determines a metadata sorting config. 
+ * It's created mainly to sort by metadata community and collection edition and creation
+ */
+export class DiscoverySortConfig implements Config {
+
+  public sortMetadata: string;
+  /**
+   * ASC / DESC values expected
+   */
+  public sortDirection: string;
+}
diff --git a/src/environments/environment.test.ts b/src/environments/environment.test.ts
index 19eec26a14..2cdbee9c29 100644
--- a/src/environments/environment.test.ts
+++ b/src/environments/environment.test.ts
@@ -283,4 +283,8 @@ export const environment: BuildConfig = {
     enabled: false,
     mathjax: false,
   },
+  collectionSelectionSort: {
+    sortMetadata:"dc.title",
+    sortDirection:"ASC",
+  },
 };

From e2668cdf972e22ee5142427d551e48956848e342 Mon Sep 17 00:00:00 2001
From: aroman-arvo <aroman@arvo.es>
Date: Mon, 13 Feb 2023 12:22:07 +0100
Subject: [PATCH 5/9] DS-8408 - lint errors

---
 .../dso-selector/dso-selector/dso-selector.component.ts       | 2 +-
 src/config/default-app-config.ts                              | 4 ++--
 src/config/discovery-sort.config.ts                           | 2 +-
 src/environments/environment.test.ts                          | 4 ++--
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/app/shared/dso-selector/dso-selector/dso-selector.component.ts b/src/app/shared/dso-selector/dso-selector/dso-selector.component.ts
index 52ca9224b1..05fb512c9a 100644
--- a/src/app/shared/dso-selector/dso-selector/dso-selector.component.ts
+++ b/src/app/shared/dso-selector/dso-selector/dso-selector.component.ts
@@ -228,7 +228,7 @@ export class DSOSelectorComponent implements OnInit, OnDestroy {
    */
   search(query: string, page: number, useCache: boolean = true): Observable<RemoteData<PaginatedList<SearchResult<DSpaceObject>>>> {
     // default sort is only used when there is not query
-    var efectiveSort=query?null:this.sort;
+    var efectiveSort=query ? null : this.sort;
     return this.searchService.search(
       new PaginatedSearchOptions({
         query: query,
diff --git a/src/config/default-app-config.ts b/src/config/default-app-config.ts
index 095a20a4e5..89a627f459 100644
--- a/src/config/default-app-config.ts
+++ b/src/config/default-app-config.ts
@@ -425,7 +425,7 @@ export class DefaultAppConfig implements AppConfig {
 
   // Configuration that determines the metadata sorting of community and collection edition and creation when there are not a search query.
   collectionSelectionSort: DiscoverySortConfig = {
-    sortMetadata:"dc.title",
-    sortDirection:"ASC",
+    sortMetadata:'dc.title',
+    sortDirection:'ASC',
   };
 }
diff --git a/src/config/discovery-sort.config.ts b/src/config/discovery-sort.config.ts
index 02428f70a8..3f08b3fb17 100644
--- a/src/config/discovery-sort.config.ts
+++ b/src/config/discovery-sort.config.ts
@@ -1,7 +1,7 @@
 import { Config } from './config.interface';
 
 /**
- * Config that determines a metadata sorting config. 
+ * Config that determines a metadata sorting config.
  * It's created mainly to sort by metadata community and collection edition and creation
  */
 export class DiscoverySortConfig implements Config {
diff --git a/src/environments/environment.test.ts b/src/environments/environment.test.ts
index c352cdca92..8b132dab60 100644
--- a/src/environments/environment.test.ts
+++ b/src/environments/environment.test.ts
@@ -298,8 +298,8 @@ export const environment: BuildConfig = {
     mathjax: false,
   },
   collectionSelectionSort: {
-    sortMetadata:"dc.title",
-    sortDirection:"ASC",
+    sortMetadata:'dc.title',
+    sortDirection:'ASC',
   },
 
   vocabularies: [

From 0121e6d895de30c6c1054b8087fa6ecb1b7dd0bd Mon Sep 17 00:00:00 2001
From: aroman-arvo <aroman@arvo.es>
Date: Mon, 13 Feb 2023 12:34:13 +0100
Subject: [PATCH 6/9] DS-8408 - more lint problems

---
 .../shared/dso-selector/dso-selector/dso-selector.component.ts  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/app/shared/dso-selector/dso-selector/dso-selector.component.ts b/src/app/shared/dso-selector/dso-selector/dso-selector.component.ts
index 05fb512c9a..fe64c0a41e 100644
--- a/src/app/shared/dso-selector/dso-selector/dso-selector.component.ts
+++ b/src/app/shared/dso-selector/dso-selector/dso-selector.component.ts
@@ -228,7 +228,7 @@ export class DSOSelectorComponent implements OnInit, OnDestroy {
    */
   search(query: string, page: number, useCache: boolean = true): Observable<RemoteData<PaginatedList<SearchResult<DSpaceObject>>>> {
     // default sort is only used when there is not query
-    var efectiveSort=query ? null : this.sort;
+    let efectiveSort = query ? null : this.sort;
     return this.searchService.search(
       new PaginatedSearchOptions({
         query: query,

From 742922dba04f3a189bdfab80bd2a57093adcb142 Mon Sep 17 00:00:00 2001
From: aroman-arvo <aroman@arvo.es>
Date: Mon, 13 Feb 2023 19:32:47 +0100
Subject: [PATCH 7/9] DS-8408: Test cases and some fixes or comcol ordering

---
 config/config.example.yml                     |  6 +--
 .../dso-selector.component.spec.ts            | 40 ++++++++++++++++++-
 ...te-collection-parent-selector.component.ts |  4 +-
 ...ate-community-parent-selector.component.ts |  5 ++-
 .../create-item-parent-selector.component.ts  |  3 ++
 .../dso-selector-modal-wrapper.component.ts   |  5 +--
 .../edit-collection-selector.component.ts     |  5 ++-
 .../edit-community-selector.component.ts      |  5 ++-
 .../scope-selector-modal.component.ts         |  7 ++++
 src/config/app-config.interface.ts            |  2 +-
 src/config/default-app-config.ts              |  4 +-
 src/config/discovery-sort.config.ts           |  2 +-
 src/environments/environment.test.ts          |  4 +-
 13 files changed, 75 insertions(+), 17 deletions(-)

diff --git a/config/config.example.yml b/config/config.example.yml
index 5fad57c654..7c784b4a8e 100644
--- a/config/config.example.yml
+++ b/config/config.example.yml
@@ -371,6 +371,6 @@ vocabularies:
     enabled: true
 
 # Default collection/community sorting order at Advanced search, Create/update community and collection when there are not a query. 
-collectionSelectionSort:
-  sortMetadata: "dc.title"
-  sortDirection: "ASC"
\ No newline at end of file
+comcolSelectionSort:
+  sortMetadata: 'dc.title'
+  sortDirection: 'ASC'
\ No newline at end of file
diff --git a/src/app/shared/dso-selector/dso-selector/dso-selector.component.spec.ts b/src/app/shared/dso-selector/dso-selector/dso-selector.component.spec.ts
index 7c28859388..e2acd17bc0 100644
--- a/src/app/shared/dso-selector/dso-selector/dso-selector.component.spec.ts
+++ b/src/app/shared/dso-selector/dso-selector/dso-selector.component.spec.ts
@@ -11,6 +11,7 @@ import { PaginatedSearchOptions } from '../../search/models/paginated-search-opt
 import { hasValue } from '../../empty.util';
 import { createPaginatedList } from '../../testing/utils.test';
 import { NotificationsService } from '../../notifications/notifications.service';
+import { SortDirection, SortOptions } from '../../../core/cache/models/sort-options.model';
 
 describe('DSOSelectorComponent', () => {
   let component: DSOSelectorComponent;
@@ -34,7 +35,7 @@ describe('DSOSelectorComponent', () => {
   ];
 
   const searchService = {
-    search: (options: PaginatedSearchOptions) => {
+    search: (options: PaginatedSearchOptions, responseMsToLive?: number, useCachedVersionIfAvailable = true) => {
       if (hasValue(options.query) && options.query.startsWith('search.resourceid')) {
         return createSuccessfulRemoteDataObject$(createPaginatedList([searchResult]));
       } else if (options.pagination.currentPage === 1) {
@@ -120,6 +121,43 @@ describe('DSOSelectorComponent', () => {
     });
   });
 
+  describe('search', () => {
+    beforeEach(() => {
+      spyOn(searchService, 'search').and.callThrough();
+    });
+
+    it('should specify how to sort if no query is given', () => {
+      component.sort = new SortOptions('dc.title', SortDirection.ASC);
+      component.search(undefined, 0);
+
+      expect(searchService.search).toHaveBeenCalledWith(
+        jasmine.objectContaining({
+          query: undefined,
+          sort: jasmine.objectContaining({
+            field: 'dc.title',
+            direction: SortDirection.ASC,
+          }),
+        }),
+        null,
+        true
+      );
+    });
+
+    it('should not specify how to sort if a query is given', () => {
+      component.sort = new SortOptions('dc.title', SortDirection.ASC);
+      component.search('testQuery', 0);
+
+      expect(searchService.search).toHaveBeenCalledWith(
+        jasmine.objectContaining({
+          query: 'testQuery',
+          sort: null,
+        }),
+        null,
+        true
+      );
+    });
+  });
+
   describe('when search returns an error', () => {
     beforeEach(() => {
       spyOn(searchService, 'search').and.returnValue(createFailedRemoteDataObject$());
diff --git a/src/app/shared/dso-selector/modal-wrappers/create-collection-parent-selector/create-collection-parent-selector.component.ts b/src/app/shared/dso-selector/modal-wrappers/create-collection-parent-selector/create-collection-parent-selector.component.ts
index 8b38b62378..e0b7c1675b 100644
--- a/src/app/shared/dso-selector/modal-wrappers/create-collection-parent-selector/create-collection-parent-selector.component.ts
+++ b/src/app/shared/dso-selector/modal-wrappers/create-collection-parent-selector/create-collection-parent-selector.component.ts
@@ -8,7 +8,8 @@ import {
     getCollectionCreateRoute,
     COLLECTION_PARENT_PARAMETER
 } from '../../../../collection-page/collection-page-routing-paths';
-
+import { SortDirection, SortOptions } from '../../../../core/cache/models/sort-options.model';
+import { environment } from '../../../../../environments/environment';
 /**
  * Component to wrap a list of existing communities inside a modal
  * Used to choose a community from to create a new collection in
@@ -23,6 +24,7 @@ export class CreateCollectionParentSelectorComponent extends DSOSelectorModalWra
   selectorTypes = [DSpaceObjectType.COMMUNITY];
   action = SelectorActionType.CREATE;
   header = 'dso-selector.create.collection.sub-level';
+  defaultSort = new SortOptions(environment.comcolSelectionSort.sortField, environment.comcolSelectionSort.sortDirection as SortDirection);
 
   constructor(protected activeModal: NgbActiveModal, protected route: ActivatedRoute, private router: Router) {
     super(activeModal, route);
diff --git a/src/app/shared/dso-selector/modal-wrappers/create-community-parent-selector/create-community-parent-selector.component.ts b/src/app/shared/dso-selector/modal-wrappers/create-community-parent-selector/create-community-parent-selector.component.ts
index a7f583df50..005c0e5f23 100644
--- a/src/app/shared/dso-selector/modal-wrappers/create-community-parent-selector/create-community-parent-selector.component.ts
+++ b/src/app/shared/dso-selector/modal-wrappers/create-community-parent-selector/create-community-parent-selector.component.ts
@@ -12,6 +12,8 @@ import {
     getCommunityCreateRoute,
     COMMUNITY_PARENT_PARAMETER
 } from '../../../../community-page/community-page-routing-paths';
+import { SortDirection, SortOptions } from '../../../../core/cache/models/sort-options.model';
+import { environment } from '../../../../../environments/environment';
 
 /**
  * Component to wrap a button - for top communities -
@@ -29,7 +31,8 @@ export class CreateCommunityParentSelectorComponent extends DSOSelectorModalWrap
   objectType = DSpaceObjectType.COMMUNITY;
   selectorTypes = [DSpaceObjectType.COMMUNITY];
   action = SelectorActionType.CREATE;
-
+  defaultSort = new SortOptions(environment.comcolSelectionSort.sortField, environment.comcolSelectionSort.sortDirection as SortDirection);
+  
   constructor(protected activeModal: NgbActiveModal, protected route: ActivatedRoute, private router: Router) {
     super(activeModal, route);
   }
diff --git a/src/app/shared/dso-selector/modal-wrappers/create-item-parent-selector/create-item-parent-selector.component.ts b/src/app/shared/dso-selector/modal-wrappers/create-item-parent-selector/create-item-parent-selector.component.ts
index b109be0af2..ed8a7b0780 100644
--- a/src/app/shared/dso-selector/modal-wrappers/create-item-parent-selector/create-item-parent-selector.component.ts
+++ b/src/app/shared/dso-selector/modal-wrappers/create-item-parent-selector/create-item-parent-selector.component.ts
@@ -4,6 +4,8 @@ import { DSpaceObjectType } from '../../../../core/shared/dspace-object-type.mod
 import { DSpaceObject } from '../../../../core/shared/dspace-object.model';
 import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap';
 import { DSOSelectorModalWrapperComponent, SelectorActionType } from '../dso-selector-modal-wrapper.component';
+import { SortDirection, SortOptions } from '../../../../core/cache/models/sort-options.model';
+import { environment } from '../../../../../environments/environment';
 
 /**
  * Component to wrap a list of existing collections inside a modal
@@ -21,6 +23,7 @@ export class CreateItemParentSelectorComponent extends DSOSelectorModalWrapperCo
   selectorTypes = [DSpaceObjectType.COLLECTION];
   action = SelectorActionType.CREATE;
   header = 'dso-selector.create.item.sub-level';
+  defaultSort = new SortOptions(environment.comcolSelectionSort.sortField, environment.comcolSelectionSort.sortDirection as SortDirection);
 
   /**
    * If present this value is used to filter collection list by entity type
diff --git a/src/app/shared/dso-selector/modal-wrappers/dso-selector-modal-wrapper.component.ts b/src/app/shared/dso-selector/modal-wrappers/dso-selector-modal-wrapper.component.ts
index fcb8aea9d2..3f81687c9f 100644
--- a/src/app/shared/dso-selector/modal-wrappers/dso-selector-modal-wrapper.component.ts
+++ b/src/app/shared/dso-selector/modal-wrappers/dso-selector-modal-wrapper.component.ts
@@ -5,8 +5,7 @@ import { RemoteData } from '../../../core/data/remote-data';
 import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap';
 import { DSpaceObjectType } from '../../../core/shared/dspace-object-type.model';
 import { hasValue, isNotEmpty } from '../../empty.util';
-import { SortDirection, SortOptions } from '../../../core/cache/models/sort-options.model';
-import { environment } from '../../../../environments/environment';
+import { SortOptions } from '../../../core/cache/models/sort-options.model';
 
 export enum SelectorActionType {
   CREATE = 'create',
@@ -54,7 +53,7 @@ export abstract class DSOSelectorModalWrapperComponent implements OnInit {
   /**
    * Default DSO ordering
    */
-  defaultSort = new SortOptions(environment.collectionSelectionSort.sortMetadata, environment.collectionSelectionSort.sortDirection as SortDirection);
+  defaultSort: SortOptions;
 
   constructor(protected activeModal: NgbActiveModal, protected route: ActivatedRoute) {
   }
diff --git a/src/app/shared/dso-selector/modal-wrappers/edit-collection-selector/edit-collection-selector.component.ts b/src/app/shared/dso-selector/modal-wrappers/edit-collection-selector/edit-collection-selector.component.ts
index cfc2ea282d..ed117995b8 100644
--- a/src/app/shared/dso-selector/modal-wrappers/edit-collection-selector/edit-collection-selector.component.ts
+++ b/src/app/shared/dso-selector/modal-wrappers/edit-collection-selector/edit-collection-selector.component.ts
@@ -8,6 +8,8 @@ import {
   SelectorActionType
 } from '../dso-selector-modal-wrapper.component';
 import { getCollectionEditRoute } from '../../../../collection-page/collection-page-routing-paths';
+import { SortDirection, SortOptions } from '../../../../core/cache/models/sort-options.model';
+import { environment } from '../../../../../environments/environment';
 
 /**
  * Component to wrap a list of existing collections inside a modal
@@ -22,7 +24,8 @@ export class EditCollectionSelectorComponent extends DSOSelectorModalWrapperComp
   objectType = DSpaceObjectType.COLLECTION;
   selectorTypes = [DSpaceObjectType.COLLECTION];
   action = SelectorActionType.EDIT;
-
+  defaultSort = new SortOptions(environment.comcolSelectionSort.sortField, environment.comcolSelectionSort.sortDirection as SortDirection);
+  
   constructor(protected activeModal: NgbActiveModal, protected route: ActivatedRoute, private router: Router) {
     super(activeModal, route);
   }
diff --git a/src/app/shared/dso-selector/modal-wrappers/edit-community-selector/edit-community-selector.component.ts b/src/app/shared/dso-selector/modal-wrappers/edit-community-selector/edit-community-selector.component.ts
index d73a7b48c5..ce09cd498e 100644
--- a/src/app/shared/dso-selector/modal-wrappers/edit-community-selector/edit-community-selector.component.ts
+++ b/src/app/shared/dso-selector/modal-wrappers/edit-community-selector/edit-community-selector.component.ts
@@ -8,6 +8,8 @@ import {
   SelectorActionType
 } from '../dso-selector-modal-wrapper.component';
 import { getCommunityEditRoute } from '../../../../community-page/community-page-routing-paths';
+import { SortDirection, SortOptions } from '../../../../core/cache/models/sort-options.model';
+import { environment } from '../../../../../environments/environment';
 
 /**
  * Component to wrap a list of existing communities inside a modal
@@ -23,7 +25,8 @@ export class EditCommunitySelectorComponent extends DSOSelectorModalWrapperCompo
   objectType = DSpaceObjectType.COMMUNITY;
   selectorTypes = [DSpaceObjectType.COMMUNITY];
   action = SelectorActionType.EDIT;
-
+  defaultSort = new SortOptions(environment.comcolSelectionSort.sortField, environment.comcolSelectionSort.sortDirection as SortDirection);
+  
   constructor(protected activeModal: NgbActiveModal, protected route: ActivatedRoute, private router: Router) {
     super(activeModal, route);
   }
diff --git a/src/app/shared/search-form/scope-selector-modal/scope-selector-modal.component.ts b/src/app/shared/search-form/scope-selector-modal/scope-selector-modal.component.ts
index 86c3010287..3301435956 100644
--- a/src/app/shared/search-form/scope-selector-modal/scope-selector-modal.component.ts
+++ b/src/app/shared/search-form/scope-selector-modal/scope-selector-modal.component.ts
@@ -4,6 +4,8 @@ import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap';
 import { DSpaceObjectType } from '../../../core/shared/dspace-object-type.model';
 import { DSOSelectorModalWrapperComponent, SelectorActionType } from '../../dso-selector/modal-wrappers/dso-selector-modal-wrapper.component';
 import { DSpaceObject } from '../../../core/shared/dspace-object.model';
+import { SortDirection, SortOptions } from '../../../core/cache/models/sort-options.model';
+import { environment } from '../../../../environments/environment';
 
 /**
  * Component to wrap a button - to select the entire repository -
@@ -33,6 +35,11 @@ export class ScopeSelectorModalComponent extends DSOSelectorModalWrapperComponen
    */
   scopeChange = new EventEmitter<DSpaceObject>();
 
+  /**
+   * Default DSO ordering
+   */
+  defaultSort = new SortOptions(environment.comcolSelectionSort.sortField, environment.comcolSelectionSort.sortDirection as SortDirection);
+
   constructor(protected activeModal: NgbActiveModal, protected route: ActivatedRoute) {
     super(activeModal, route);
   }
diff --git a/src/config/app-config.interface.ts b/src/config/app-config.interface.ts
index 1bc3e33b8a..e3f8988744 100644
--- a/src/config/app-config.interface.ts
+++ b/src/config/app-config.interface.ts
@@ -47,7 +47,7 @@ interface AppConfig extends Config {
   info: InfoConfig;
   markdown: MarkdownConfig;
   vocabularies: FilterVocabularyConfig[];
-  collectionSelectionSort: DiscoverySortConfig;
+  comcolSelectionSort: DiscoverySortConfig;
 }
 
 /**
diff --git a/src/config/default-app-config.ts b/src/config/default-app-config.ts
index 89a627f459..67c2feada8 100644
--- a/src/config/default-app-config.ts
+++ b/src/config/default-app-config.ts
@@ -424,8 +424,8 @@ export class DefaultAppConfig implements AppConfig {
     ];
 
   // Configuration that determines the metadata sorting of community and collection edition and creation when there are not a search query.
-  collectionSelectionSort: DiscoverySortConfig = {
-    sortMetadata:'dc.title',
+  comcolSelectionSort: DiscoverySortConfig = {
+    sortField:'dc.title',
     sortDirection:'ASC',
   };
 }
diff --git a/src/config/discovery-sort.config.ts b/src/config/discovery-sort.config.ts
index 3f08b3fb17..c0d5e5e391 100644
--- a/src/config/discovery-sort.config.ts
+++ b/src/config/discovery-sort.config.ts
@@ -6,7 +6,7 @@ import { Config } from './config.interface';
  */
 export class DiscoverySortConfig implements Config {
 
-  public sortMetadata: string;
+  public sortField: string;
   /**
    * ASC / DESC values expected
    */
diff --git a/src/environments/environment.test.ts b/src/environments/environment.test.ts
index 8b132dab60..08d7739f7d 100644
--- a/src/environments/environment.test.ts
+++ b/src/environments/environment.test.ts
@@ -297,8 +297,8 @@ export const environment: BuildConfig = {
     enabled: false,
     mathjax: false,
   },
-  collectionSelectionSort: {
-    sortMetadata:'dc.title',
+  comcolSelectionSort: {
+    sortField:'dc.title',
     sortDirection:'ASC',
   },
 

From 9a2b885501dddda76ead69184ce48680cd791e28 Mon Sep 17 00:00:00 2001
From: aroman-arvo <aroman@arvo.es>
Date: Mon, 13 Feb 2023 19:38:32 +0100
Subject: [PATCH 8/9] DS-8498: ling fixes

---
 .../create-community-parent-selector.component.ts               | 2 +-
 .../edit-collection-selector.component.ts                       | 2 +-
 .../edit-community-selector.component.ts                        | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/app/shared/dso-selector/modal-wrappers/create-community-parent-selector/create-community-parent-selector.component.ts b/src/app/shared/dso-selector/modal-wrappers/create-community-parent-selector/create-community-parent-selector.component.ts
index 005c0e5f23..77458d9802 100644
--- a/src/app/shared/dso-selector/modal-wrappers/create-community-parent-selector/create-community-parent-selector.component.ts
+++ b/src/app/shared/dso-selector/modal-wrappers/create-community-parent-selector/create-community-parent-selector.component.ts
@@ -32,7 +32,7 @@ export class CreateCommunityParentSelectorComponent extends DSOSelectorModalWrap
   selectorTypes = [DSpaceObjectType.COMMUNITY];
   action = SelectorActionType.CREATE;
   defaultSort = new SortOptions(environment.comcolSelectionSort.sortField, environment.comcolSelectionSort.sortDirection as SortDirection);
-  
+
   constructor(protected activeModal: NgbActiveModal, protected route: ActivatedRoute, private router: Router) {
     super(activeModal, route);
   }
diff --git a/src/app/shared/dso-selector/modal-wrappers/edit-collection-selector/edit-collection-selector.component.ts b/src/app/shared/dso-selector/modal-wrappers/edit-collection-selector/edit-collection-selector.component.ts
index ed117995b8..fd54cd44ed 100644
--- a/src/app/shared/dso-selector/modal-wrappers/edit-collection-selector/edit-collection-selector.component.ts
+++ b/src/app/shared/dso-selector/modal-wrappers/edit-collection-selector/edit-collection-selector.component.ts
@@ -25,7 +25,7 @@ export class EditCollectionSelectorComponent extends DSOSelectorModalWrapperComp
   selectorTypes = [DSpaceObjectType.COLLECTION];
   action = SelectorActionType.EDIT;
   defaultSort = new SortOptions(environment.comcolSelectionSort.sortField, environment.comcolSelectionSort.sortDirection as SortDirection);
-  
+
   constructor(protected activeModal: NgbActiveModal, protected route: ActivatedRoute, private router: Router) {
     super(activeModal, route);
   }
diff --git a/src/app/shared/dso-selector/modal-wrappers/edit-community-selector/edit-community-selector.component.ts b/src/app/shared/dso-selector/modal-wrappers/edit-community-selector/edit-community-selector.component.ts
index ce09cd498e..cf2f97c6d3 100644
--- a/src/app/shared/dso-selector/modal-wrappers/edit-community-selector/edit-community-selector.component.ts
+++ b/src/app/shared/dso-selector/modal-wrappers/edit-community-selector/edit-community-selector.component.ts
@@ -26,7 +26,7 @@ export class EditCommunitySelectorComponent extends DSOSelectorModalWrapperCompo
   selectorTypes = [DSpaceObjectType.COMMUNITY];
   action = SelectorActionType.EDIT;
   defaultSort = new SortOptions(environment.comcolSelectionSort.sortField, environment.comcolSelectionSort.sortDirection as SortDirection);
-  
+
   constructor(protected activeModal: NgbActiveModal, protected route: ActivatedRoute, private router: Router) {
     super(activeModal, route);
   }

From 938bf33ad24bc8d0545c8fc936bfc6bcaadf93d0 Mon Sep 17 00:00:00 2001
From: aroman-arvo <aroman@arvo.es>
Date: Wed, 15 Feb 2023 19:20:20 +0100
Subject: [PATCH 9/9] DS-8404 - fix config param name

---
 config/config.example.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/config/config.example.yml b/config/config.example.yml
index 7c784b4a8e..f1e6be76aa 100644
--- a/config/config.example.yml
+++ b/config/config.example.yml
@@ -372,5 +372,5 @@ vocabularies:
 
 # Default collection/community sorting order at Advanced search, Create/update community and collection when there are not a query. 
 comcolSelectionSort:
-  sortMetadata: 'dc.title'
+  sortField: 'dc.title'
   sortDirection: 'ASC'
\ No newline at end of file