Merge branch 'master' of code-repo.d4science.org:MaDgIK/connect-admin

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/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

@@ -49,7 +49,6 @@ export class CriteriaComponent implements OnInit, OnChanges, AfterViewInit, OnDe
   }
   
   ngOnInit() {
-    this.reset();
     this.loading = false;
     this.subscriptions.push(this.vocabulariesService.getVocabularyByType('fos', null, properties).subscribe((fos: any[]) => {
       this.fos = fos.map(element => element.id);
@@ -60,6 +59,9 @@ export class CriteriaComponent implements OnInit, OnChanges, AfterViewInit, OnDe
   }
   
   ngOnChanges(changes: SimpleChanges) {
+    if(changes.selectionCriteria){
+      this.reset();
+    }
     this.calculateMaxHeight();
   }
   
@@ -86,10 +88,11 @@ export class CriteriaComponent implements OnInit, OnChanges, AfterViewInit, OnDe
   }
   
   reset() {
-    if (this.selectionCriteria?.criteria) {
     this.selectionCriteriaForm = this.fb.group({
       criteria: this.fb.array([])
     });
+    if (this.selectionCriteria?.criteria) {
+
       this.selectionCriteria.criteria.forEach(criterion => {
         let constraintArray: UntypedFormArray = this.fb.array([]);
         criterion.constraint.forEach(constraint => {
@@ -158,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/customization/background-upload.component.ts

@@ -26,6 +26,7 @@ declare var UIkit;
            class="uk-float-right  uk-border-rounded uk-margin-top uk-margin-right uk-background-muted uk-button uk-button-link">
           <icon name="delete" [defaultSize]="true" [flex]="true"></icon>
         </a>
+        <div class="uk-text-small uk-margin-large-top uk-text-center" [class.uk-light]="!light">Lorem ipsum dolor sit amet...</div>
       </div>
     </div>
     <div *ngIf="background.imageFile" class="uk-margin-top">
@@ -51,7 +52,7 @@ export class BackgroundUploadComponent implements OnInit {
   @Input() oldBackground;
   // @Input() light:boolean;
   @Input() communityId: string = "";
-  
+  @Input() light:boolean; //fonts mode
   public file: File;
   // public photo: string | ArrayBuffer;
   private maxsize: number = 2000 * 1024;

src/app/pages/customization/color.component.ts

@@ -17,7 +17,7 @@ import {CustomizationOptions} from '../../openaireLibrary/connect/community/Cust
       </div>
     </div>    
 
-    <div class="uk-text-warning uk-text-xsmall uk-margin-small-left" *ngIf="warningForContrast(color)">Contrast ratio may be too low.</div>
+    <div class="uk-text-warning uk-text-xsmall uk-margin-small-left" [class.uk-invisible]="!warningForContrast(color)">Contrast ratio may be too low.</div>
   `,
   styles:[
     `

src/app/pages/customization/customization.component.html

@@ -207,11 +207,35 @@
       <background label="Light" [background]="draftCustomizationOptions.backgrounds.light"
                   [light]="true"></background>
       <background label="Hero section" [background]="draftCustomizationOptions.backgrounds.form"
-                  [light]="true"
+                  [light]="draftCustomizationOptions.backgrounds.form.fontsDarkMode"
                   [oldBackground]="publishedCustomizationOptions.backgrounds.form"
                   [communityId]="communityId" description="The area under menu"></background>
-      <div class="uk-margin-xsmall-bottom uk-text-uppercase uk-text-meta uk-text-bold uk-margin-large-top uk-flex uk-flex-middle">
+      <div class="uk-margin-xsmall-bottom uk-text-uppercase uk-text-meta uk-text-bold uk-margin-large-top uk-flex uk-flex-middle uk-heading-divider">
-        Hero section image
+        Hero section
+      </div>
+      <div class="uk-margin-xsmall-bottom uk-text-uppercase uk-text-meta uk-text-bold uk-margin-medium-top uk-flex uk-flex-middle">
+        Fonts
+        <a *ngIf="( publishedCustomizationOptions.backgrounds.form.fontsDarkMode != draftCustomizationOptions.backgrounds.form.fontsDarkMode  )
+                  && draftCustomizationOptions.backgroundsIsCustom"
+           (click)="draftCustomizationOptions.backgrounds.form.fontsDarkMode=publishedCustomizationOptions.backgrounds.form.fontsDarkMode;" class="uk-margin-small-left uk-button-link"
+           uk-tooltip="title:<div class='uk-width-large'>Reset to previously saved options</div>">
+          <icon name="settings_backup_restore" flex="true"></icon>
+        </a>
+      </div>
+      <div class="uk-margin-small-top">
+        <span>Dark mode </span>
+        <span>
+                  <mat-slide-toggle class="uk-margin-large-left"
+                                    [checked]="draftCustomizationOptions.backgrounds.form.fontsDarkMode"
+                                    (change)="draftCustomizationOptions.backgrounds.form.fontsDarkMode=!draftCustomizationOptions.backgrounds.form.fontsDarkMode;"
+                                    [attr.uk-tooltip]="'title:<div class=\'uk-width-large\'>' +
+                        (draftCustomizationOptions.backgrounds.form.fontsDarkMode?'Change to light color mode if the hero section background is dark':'Change to dark mode if the hero section background is light')+'</div>'"
+                  >
+                  </mat-slide-toggle>
+                  </span>
+      </div>
+      <div class="uk-margin-xsmall-bottom uk-text-uppercase uk-text-meta uk-text-bold uk-margin-medium-top uk-flex uk-flex-middle">
+        Image
         <a *ngIf="(formHasChanges(publishedCustomizationOptions, draftCustomizationOptions)  )
                   && draftCustomizationOptions.backgroundsIsCustom"
            (click)="resetImageTo(publishedCustomizationOptions.backgrounds);" class="uk-margin-small-left uk-button-link"
@@ -222,7 +246,7 @@
       <div class="uk-margin-medium-bottom">
       <background-upload label="Form" [background]="draftCustomizationOptions.backgrounds.form"
                          [oldBackground]="publishedCustomizationOptions.backgrounds.form"
-                         [communityId]="communityId"></background-upload>
+                         [communityId]="communityId" [light]="draftCustomizationOptions.backgrounds.form.fontsDarkMode" ></background-upload>
       </div>
     </div>
   </div>

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";