Merge remote-tracking branch 'origin/develop' into angular-16

src/app/app.component.ts

@@ -314,7 +314,7 @@ export class AppComponent implements OnInit, OnDestroy {
     } else {
       this.properties.adminToolsPortalType = "connect";
       if (this.document) {
-        this.initLayout('connect');
+        this.initLayout(this.communityId?this.communityId:'connect');
       }
     }
     this.configurationService.initPortal(this.properties, (communityId) ? communityId : this.properties.adminToolsPortalType);
@@ -454,7 +454,7 @@ export class AppComponent implements OnInit, OnDestroy {
       }
       this.showMenu = true;
     } else {
-      this.communityId = null;
+      this.communityId = (this.community && ConnectHelper.isPrivate(this.community, this.user))?this.community.communityId:null;
       this.configurationService.initPortal(this.properties, "connect");
       this.buildConnectMenu(true);
       if (this.community && this.community.status == "manager") {

src/app/community/community.component.html

@@ -174,16 +174,18 @@
           <!--          </div>-->
           <!--        </div>-->
 
-          <div class="uk-margin-medium-top" uk-scrollspy-class>
+          <div [class.uk-invisible]="disableSelect" class="uk-margin-medium-top">
-            <div class="uk-flex uk-flex-right uk-text-small">
+            <advanced-search-input #advanced (searchEmitter)="goTo(true)">
-              <a [routerLink]="properties.searchLinkToAdvancedResults" class="uk-margin-small-bottom">
+              <entities-selection class="uk-width-1-3" [simpleView]="true" currentEntity="result" [selectedEntity]="selectedEntity" [customFilter]="customFilter"
-                Advanced search
+                                  (selectionChange)="entityChanged($event);advanced.focusNext(input, $event)" (disableSelectEmitter)="disableSelectChange($event)"
-              </a>
+                                  [onChangeNavigate]="false"></entities-selection>
+              <div input #input class="uk-width-expand"  placeholder="Scholary works" [searchable]="true" [hint]="'Search in OpenAIRE'" [(value)]="keyword"></div>
+            </advanced-search-input>
+            <div *ngIf="selectedEntity === 'result' && input.focused" (click)="$event.stopPropagation();advanced.focusNext(input, $event)" class="uk-dropdown uk-display-block uk-margin-small-top uk-width-auto">
+              <div class="uk-padding-small">
+                <quick-selections [resultTypes]="resultTypes" [quickFilter]="resultsQuickFilter"></quick-selections>
+              </div>
             </div>
-            <div search-input [(value)]="keyword"
-                 [placeholder]="'Search'+(portal && portal.name ? (' in '+portal.name) : '')"
-                 (searchEmitter)="goTo(true)"
-                 [searchInputClass]="'inner background'"></div>
           </div>
         </div>
       </div>

src/app/community/community.module.ts

@@ -12,10 +12,16 @@ import {InviteModule} from '../utils/subscribe/invite/invite.module';
 import {ManageModule} from '../openaireLibrary/utils/manage/manage.module';
 
 import {StatisticsModule} from "../statistics/statistics.module";
-import {SearchZenodoCommunitiesServiceModule} from '../openaireLibrary/connect/zenodoCommunities/searchZenodoCommunitiesService.module';
+import {
-import {ZenodoCommunitiesServiceModule} from '../openaireLibrary/connect/zenodoCommunities/zenodo-communitiesService.module';
+  SearchZenodoCommunitiesServiceModule
+} from '../openaireLibrary/connect/zenodoCommunities/searchZenodoCommunitiesService.module';
+import {
+  ZenodoCommunitiesServiceModule
+} from '../openaireLibrary/connect/zenodoCommunities/zenodo-communitiesService.module';
 import {SearchFormModule} from '../openaireLibrary/searchPages/searchUtils/searchForm.module';
-import {SearchDataprovidersServiceModule} from "../openaireLibrary/connect/contentProviders/searchDataprovidersService.module";
+import {
+  SearchDataprovidersServiceModule
+} from "../openaireLibrary/connect/contentProviders/searchDataprovidersService.module";
 import {SearchProjectsServiceModule} from '../openaireLibrary/connect/projects/searchProjectsService.module';
 import {SearchResearchResultsServiceModule} from "../openaireLibrary/services/searchResearchResultsService.module";
 import {SearchResultsModule} from "../openaireLibrary/searchPages/searchUtils/searchResults.module";
@@ -29,12 +35,13 @@ import {SearchTabModule} from "../openaireLibrary/utils/tabs/contents/search-tab
 import {ErrorMessagesModule} from "../openaireLibrary/utils/errorMessages.module";
 import {SafeHtmlPipeModule} from '../openaireLibrary/utils/pipes/safeHTMLPipe.module';
 import {ErrorModule} from "../openaireLibrary/error/error.module";
-import {AdvancedSearchInputModule} from '../openaireLibrary/sharedComponents/advanced-search-input/advanced-search-input.module';
+import {
+  AdvancedSearchInputModule
+} from '../openaireLibrary/sharedComponents/advanced-search-input/advanced-search-input.module';
 import {InputModule} from '../openaireLibrary/sharedComponents/input/input.module';
 import {QuickSelectionsModule} from '../openaireLibrary/searchPages/searchUtils/quick-selections.module';
 import {IconsModule} from '../openaireLibrary/utils/icons/icons.module';
 import {NoLoadPaging} from '../openaireLibrary/searchPages/searchUtils/no-load-paging.module';
-import {SearchInputModule} from "../openaireLibrary/sharedComponents/search-input/search-input.module";
 
 @NgModule({
   imports: [
@@ -44,7 +51,7 @@ import {SearchInputModule} from "../openaireLibrary/sharedComponents/search-inpu
     SearchResearchResultsServiceModule, SearchResultsModule, CuratorsModule, AffiliationsModule,
     SEOServiceModule, MatSelectModule, EntitiesSelectionModule,
     TabsModule, SearchTabModule, ErrorMessagesModule, SafeHtmlPipeModule, ErrorModule,
-    AdvancedSearchInputModule, InputModule, QuickSelectionsModule, IconsModule, NoLoadPaging, SearchInputModule
+    AdvancedSearchInputModule, InputModule, QuickSelectionsModule, IconsModule, NoLoadPaging
   ],
   declarations: [
     CommunityComponent