Merge from Develop. Resolve (Connect Admin release 30th August 2023 #3)

src/app/app.component.ts

@@ -126,7 +126,7 @@ export class AppComponent implements OnInit {
     this.subscriptions.push(this.data.subscribe(data => {
       if(data && data.portal) {
         this.setProperties(data.portal);
-        this.configurationService.initCommunityInformation(this.properties, this.properties.adminToolsCommunity);
+        this.configurationService.initPortal(this.properties, this.properties.adminToolsCommunity);
       }
     }));
     this.subscriptions.push(this.userManagementService.getUserInfo().subscribe(user => {
@@ -172,7 +172,7 @@ export class AppComponent implements OnInit {
     } else {
       ConnectHelper.setPortalTypeFromPid(id);
     }
-    this.configurationService.initCommunityInformation(this.properties, this.properties.adminToolsCommunity);
+    this.configurationService.initPortal(this.properties, this.properties.adminToolsCommunity);
   }
   
   public get open() {

src/app/openaireLibrary

@@ -1 +1 @@
-Subproject commit 56428d0daed8726c9c70c8b7dad8f11b4ed604b8
+Subproject commit c292215ada387fb0385cb77e67b3906104f4ee8a

src/app/pages/advanced-criteria/advanced-criteria.component.ts

@@ -48,7 +48,7 @@ import {CommunityInfo} from "../../openaireLibrary/connect/community/communityIn
       </div>
     </div>
     <fs-modal #filtersModal (okEmitter)="saveCriteria()" (cancelEmitter)="criteria.reset()"
-              [okButtonDisabled]="criteria && criteria.disabled">
+              [okButtonDisabled]="!criteria || criteria.disabled">
       <div *ngIf="selectionCriteria" class="uk-container uk-container-large">
         <criteria #criteria [height]="filtersModal.bodyHeight" [entityType]="'criterion'"
                   [entityTypePlural]="'criteria'" [selectionCriteria]="selectionCriteria">

src/app/pages/content-providers/criteria/criteria.component.ts

@@ -161,7 +161,7 @@ export class CriteriaComponent implements OnInit, OnChanges, AfterViewInit, OnDe
   }
   
   get dirty() {
-    if (!this.selectionCriteria || !this.criteria) {
+    if (!this.selectionCriteria && !this.criteria) {
       return false;
     } else if (this.criteria.length !== this.criteriaArray.length) {
       return true;

src/app/pages/stats/stats.component.ts

@@ -133,7 +133,7 @@ export class StatsComponent implements OnInit {
         this._router.navigate(['/user-info'], { queryParams: { "errorCode": LoginErrorCodes.NOT_VALID, "redirectUrl":  this._router.url} });
       } else {
         //console.log(`calling ${this.properties.adminToolsAPIURL}/communityFull/${this.communityId}`);
-        this.configService.communityInformationState.subscribe(
+        this.configService.portalAsObservable.subscribe(
             res => {
               console.debug(res);
               if(res) {

src/app/pages/subjects/subjects-edit-form/subjects-edit-form.component.html

@@ -31,19 +31,19 @@
             <li class="uk-active" *ngIf="displayedAllSubjects?.length" (click)="groupSubjects(displayedAllSubjects, 'all')">
               <a>All ({{displayedAllSubjects.length}})</a>
             </li>
-            <li *ngIf="displayedSubjects?.length" (click)="groupSubjects(displayedSubjects, 'freeText')">
+            <li (click)="groupSubjects(displayedSubjects, 'freeText')">
               <a>Free Text ({{displayedSubjects.length}})</a>
             </li>
-            <li *ngIf="displayedSdg?.length" (click)="groupSubjects(displayedSdg, 'sdg')">
+            <li (click)="groupSubjects(displayedSdg, 'sdg')">
               <a>SDGs ({{displayedSdg.length}})</a>
             </li>
-            <li *ngIf="displayedFos?.length" (click)="groupSubjects(displayedFos, 'fos')">
+            <li (click)="groupSubjects(displayedFos, 'fos')">
               <a>Fields of Science ({{displayedFos.length}})</a>
             </li>
           </ul>
           <ul class="uk-switcher">
-            <li *ngIf="displayedAllSubjects?.length">
+            <li>
-              <ng-container *ngIf="groupedAllSubjects?.length">
+              <ng-container *ngIf="displayedAllSubjects?.length">
                 <div>
                   <ul class="uk-nav uk-nav-default uk-flex uk-flex-wrap">
                     <li *ngFor="let item of groupedAllSubjects; let i = index;" class="uk-margin-right" [class.uk-margin-left]="i != 0"
@@ -97,9 +97,14 @@
                   </div>
                 </div>
               </ng-container>
+              <ng-container *ngIf="displayedAllSubjects?.length === 0">
+                <div class="uk-position-relative uk-height-medium">
+                  <h6 class="uk-position-center uk-margin-remove">There are no subjects yet</h6>
+                </div>
+              </ng-container>
             </li>
-            <li *ngIf="displayedSubjects?.length">
+            <li>
-              <ng-container *ngIf="groupedSubjects?.length">
+              <ng-container *ngIf="displayedSubjects?.length">
                 <div>
                   <ul class="uk-nav uk-nav-default uk-flex uk-flex-wrap">
                     <li *ngFor="let item of groupedSubjects; let i = index;" class="uk-margin-right" [class.uk-margin-left]="i != 0"
@@ -153,9 +158,14 @@
                   </div>
                 </div>
               </ng-container>
+              <ng-container *ngIf="displayedSubjects?.length === 0">
+                <div class="uk-position-relative uk-height-medium">
+                  <h6 class="uk-position-center uk-margin-remove">There are no subjects yet</h6>
+                </div>
+              </ng-container>
             </li>
-            <li *ngIf="displayedSdg?.length">
+            <li>
-              <ng-container *ngIf="groupedSdg?.length">
+              <ng-container *ngIf="displayedSdg?.length">
                 <div>
                   <ul class="uk-nav uk-nav-default uk-flex uk-flex-wrap">
                     <li *ngFor="let item of groupedSdg; let i = index;" class="uk-margin-right" [class.uk-margin-left]="i != 0"
@@ -209,9 +219,14 @@
                   </div>
                 </div>
               </ng-container>
+              <ng-container *ngIf="displayedSdg?.length === 0">
+                <div class="uk-position-relative uk-height-medium">
+                  <h6 class="uk-position-center uk-margin-remove">There are no subjects yet</h6>
+                </div>
+              </ng-container>
             </li>
-            <li *ngIf="displayedFos?.length">
+            <li>
-              <ng-container *ngIf="groupedFos?.length">
+              <ng-container *ngIf="displayedFos?.length">
                 <div>
                   <ul class="uk-nav uk-nav-default uk-flex uk-flex-wrap">
                     <li *ngFor="let item of groupedFos; let i = index;" class="uk-margin-right" [class.uk-margin-left]="i != 0"
@@ -265,7 +280,13 @@
                   </div>
                 </div>
               </ng-container>
+              <ng-container *ngIf="displayedFos?.length === 0">
+                <div class="uk-position-relative uk-height-medium">
+                  <h6 class="uk-position-center uk-margin-remove">There are no subjects yet</h6>
+                </div>
+              </ng-container>
             </li>
+
           </ul>
         </div>
       </div>

src/app/pages/subjects/subjects-edit-form/subjects-edit-form.component.ts

@@ -10,7 +10,9 @@ import {AlertModal} from '../../../openaireLibrary/utils/modal/alert';
 import {SearchInputComponent} from '../../../openaireLibrary/sharedComponents/search-input/search-input.component';
 import {forkJoin, Subscription} from 'rxjs';
 import {CommunityInfo} from '../../../openaireLibrary/connect/community/communityInfo';
-import {FullScreenModalComponent} from 'src/app/openaireLibrary/utils/modal/full-screen-modal/full-screen-modal.component';
+import {
+    FullScreenModalComponent
+} from 'src/app/openaireLibrary/utils/modal/full-screen-modal/full-screen-modal.component';
 import {HelperFunctions} from 'src/app/openaireLibrary/utils/HelperFunctions.class';
 import {NotificationHandler} from "../../../openaireLibrary/utils/notification-handler";
 import {ClearCacheService} from "../../../openaireLibrary/services/clear-cache.service";

src/assets/common-assets

@@ -1 +1 @@
-Subproject commit d8e7e5439fbd606301b51fdd5ed5115d9ad75c22
+Subproject commit 031329d5ca890663a0911e3dac5649eb5c00c601

src/assets/openaire-theme

@@ -1 +1 @@
-Subproject commit 64c5ed3d459df4947b0ab93917960c7fb8d1e507
+Subproject commit ac458b5a6d156167d7b6c9005ef1f9cfac75d3ae