Merge branch 'w2p-55693_Item-mapping-to-collections' into w2p-55946_Item-mapping-on-item-level

Conflicts:
	src/app/+collection-page/collection-item-mapper/collection-item-mapper.component.html

src/app/+collection-page/collection-item-mapper/collection-item-mapper.component.html

@@ -5,16 +5,6 @@
       <p [innerHTML]="'collection.item-mapper.collection' | translate:{ name: (collectionRD$ | async)?.payload?.name }" id="collection-name"></p>
       <p>{{'collection.item-mapper.description' | translate}}</p>
 
-      <div class="row">
-        <div class="col-12 col-lg-6">
-          <ds-search-form id="search-form"
-                          [query]="(searchOptions$ | async)?.query"
-                          [scope]="(searchOptions$ | async)?.scope"
-                          [currentUrl]="getCurrentUrl()">
-          </ds-search-form>
-        </div>
-      </div>
-
       <ngb-tabset (tabChange)="tabChange($event)" [destroyOnHide]="false">
         <ngb-tab title="{{'collection.item-mapper.tabs.browse' | translate}}">
           <ng-template ngbTabContent>
@@ -31,7 +21,17 @@
         </ngb-tab>
         <ngb-tab title="{{'collection.item-mapper.tabs.map' | translate}}">
           <ng-template ngbTabContent>
-            <div class="mt-2">
+            <div class="row mt-2">
+              <div class="col-12 col-lg-6">
+                <ds-search-form id="search-form"
+                                [query]="(searchOptions$ | async)?.query"
+                                [scope]="(searchOptions$ | async)?.scope"
+                                [currentUrl]="getCurrentUrl()">
+                </ds-search-form>
+              </div>
+            </div>
+
+            <div>
               <ds-item-select class="mt-2"
                 [key]="'map'"
                 [dsoRD$]="mappingItemsRD$"