Merge branch 'develop' of code-repo.d4science.org:MaDgIK/openaire-library into develop

landingPages/landing-utils/parsingFunctions.class.ts

@@ -581,7 +581,7 @@ export class ParsingFunctions {
     
     return eoscSubjectsFound;
   }
-  
+
   // publication & dataset landing : for subjects and otherSubjects and classifiedSubjects
   parseAllSubjects(_subjects: any, vocabulary: any): [string[], Map<string, string[]>, Map<string, string[]>, string[], string[],] {
     // let eoscSubjectsFound = [];
@@ -590,12 +590,12 @@ export class ParsingFunctions {
     let classifiedSubjects: Map<string, string[]>;
     let fos: string[];
     let sdg: string[];
-    
+
     let setOfEoscSubjects: Set<string> = new Set();
-    
+
     let subject;
     let length = Array.isArray(_subjects) ? _subjects.length : 1;
-    
+
     for (let i = 0; i < length; i++) {
       subject = Array.isArray(_subjects) ? _subjects[i] : _subjects;
       if (subject.classid != "") {
@@ -628,7 +628,7 @@ export class ParsingFunctions {
             if (classifiedSubjects == undefined) {
               classifiedSubjects = new Map<string, string[]>();
             }
-            
+
             let content: string = subject.content + "";
             // let checkAndAddEoscSubjectResp = this.checkAndAddEoscSubject(setOfEoscSubjects, eoscSubjectsFound, subject, content);
             // let found: boolean = checkAndAddEoscSubjectResp["found"];
@@ -639,7 +639,11 @@ export class ParsingFunctions {
             if (!classifiedSubjects.has(subject.classname)) {
               classifiedSubjects.set(subject.classname, new Array<string>());
             }
-            classifiedSubjects.get(subject.classname).push(content);
+            if(properties.environment == "production") {
+              classifiedSubjects.get(subject.classname).push(content);
+            } else {
+              classifiedSubjects.get(subject.classname).push(subject.classid + ": " + content);
+            }
             // }
           }
         } else {
@@ -659,6 +663,14 @@ export class ParsingFunctions {
         }
       }
     }
+
+    if(properties.environment != "production" && classifiedSubjects != null) {
+      for (let classified of classifiedSubjects.keys()) {
+        subjects = subjects.concat(classifiedSubjects.get(classified));
+      }
+      classifiedSubjects = null;
+    }
+
     return [subjects, otherSubjects, classifiedSubjects, fos, sdg];
   }
   

landingPages/result/deletedByInference/deletedByInference.component.ts

@@ -28,7 +28,7 @@ import {HelperFunctions} from "../../../utils/HelperFunctions.class";
         <li *ngFor="let result of results.slice((page-1)*pageSize, page*pageSize)">
           <result-preview [modal]="modal" [properties]="properties" [hasLink]="false" [result]="getResultPreview(result)" 
                           [showOrcid]="false" [prevPath]="prevPath" [showInline]="true" 
-                          [isDeletedByInferenceModal]="true"></result-preview>
+                          [isDeletedByInferenceModal]="true" [isMobile]="isMobile"></result-preview>
         </li>
       </ul>
       <no-load-paging *ngIf="results.length > pageSize" [type]="type"
@@ -40,6 +40,7 @@ import {HelperFunctions} from "../../../utils/HelperFunctions.class";
   `
 })
 export class DeletedByInferenceComponent {
+  @Input() isMobile: boolean = false;
   @Input() prevPath: string = "";
   public results: ResultLandingInfo[] = [];
   @Input() id: string;

landingPages/result/resultLanding.component.html

@@ -1169,19 +1169,27 @@
   <deletedByInference *ngIf="type == 'publication' && deleteByInferenceOpened"
                       [id]="resultLandingInfo.record['result']['header']['dri:objIdentifier']"
                       [ids]="resultLandingInfo.deletedByInferenceIds"
-                      [resultType]="type" [type]="openaireEntities.PUBLICATIONS"></deletedByInference>
+                      [resultType]="type" [type]="openaireEntities.PUBLICATIONS"
+                      [isMobile]="isMobile"
+                      [modal]="alertModalDeletedByInferenceFS"></deletedByInference>
   <deletedByInference *ngIf="type == 'dataset' && deleteByInferenceOpened"
                       [id]="resultLandingInfo.record['result']['header']['dri:objIdentifier']"
                       [ids]="resultLandingInfo.deletedByInferenceIds"
-                      [resultType]="'dataset'" [type]="openaireEntities.DATASETS"></deletedByInference>
+                      [resultType]="'dataset'" [type]="openaireEntities.DATASETS"
+                      [isMobile]="isMobile"
+                      [modal]="alertModalDeletedByInferenceFS"></deletedByInference>
   <deletedByInference *ngIf="type == 'software' && deleteByInferenceOpened"
                       [id]="resultLandingInfo.record['result']['header']['dri:objIdentifier']"
                       [ids]="resultLandingInfo.deletedByInferenceIds"
-                      [resultType]="type" [type]="openaireEntities.SOFTWARE"></deletedByInference>
+                      [resultType]="type" [type]="openaireEntities.SOFTWARE"
+                      [isMobile]="isMobile"
+                      [modal]="alertModalDeletedByInferenceFS"></deletedByInference>
   <deletedByInference *ngIf="type == 'orp' && deleteByInferenceOpened"
                       [id]="resultLandingInfo.record['result']['header']['dri:objIdentifier']"
                       [ids]="resultLandingInfo.deletedByInferenceIds"
-                      [resultType]="'other'" [type]="openaireEntities.OTHER"></deletedByInference>
+                      [resultType]="'other'" [type]="openaireEntities.OTHER"
+                      [isMobile]="isMobile"
+                      [modal]="alertModalDeletedByInferenceFS"></deletedByInference>
 </fs-modal>
 
 <fs-modal *ngIf="resultLandingInfo" #citeFsModal classTitle="uk-tile-default uk-border-bottom">

searchPages/searchOrganizations.component.ts

@@ -33,6 +33,7 @@ import {RefineFieldResultsService} from "../services/refineFieldResults.service"
         [includeOnlyResultsAndFilter]="includeOnlyResultsAndFilter"
         [searchForm]="searchForm"
         [sort]="false"
+        [showRefine]="refineFields?.length > 0"
         [filters]="filters"
         [simpleView]="simpleView" formPlaceholderText="Search by organization name..."
         [showSwitchSearchLink]="showSwitchSearchLink"

searchPages/searchUtils/newSearchPage.component.html

@@ -288,8 +288,14 @@
       </div>
       <div class="uk-container uk-margin-top" [class.uk-container-large]="!mobile" [class.uk-container-expand]="mobile" [class.uk-padding-remove-horizontal]="mobile">
         <div class="uk-grid uk-margin-large-bottom" [class.uk-margin-top]="!mobile" uk-grid>
-          <div *ngIf="!mobile && showRefine && (searchUtils.refineStatus == errorCodes.DONE && ((orderedFilters && orderedFilters.length > 0) || (staticFilters && staticFilters.length > 0)
+<!--          <div *ngIf="!mobile && showRefine -->
-          || (rangeFilters && rangeFilters.length > 0) || (filters && filters.length > 0)))
+<!--          && (searchUtils.refineStatus == errorCodes.DONE && ((orderedFilters && orderedFilters.length > 0) || (staticFilters && staticFilters.length > 0)-->
+<!--          || (rangeFilters && rangeFilters.length > 0) || (filters && filters.length > 0)))-->
+<!--          && (results.length > 0 || (searchUtils.refineStatus == errorCodes.LOADING && searchUtils.status != errorCodes.LOADING) || (!hideFilters &&-->
+<!--          (existingFiltersWithValues > 0 || (selectedRangeFilters + selectedFilters + selectedTypesNum) > 0))) "-->
+<!--               class="uk-width-1-4@m search-filters">-->
+<!--          </div>-->
+          <div *ngIf="!mobile && showRefine
           && (results.length > 0 || (searchUtils.refineStatus == errorCodes.LOADING && searchUtils.status != errorCodes.LOADING) || (!hideFilters &&
           (existingFiltersWithValues > 0 || (selectedRangeFilters + selectedFilters + selectedTypesNum) > 0))) "
                class="uk-width-1-4@m search-filters">

sharedComponents/bottom.component.html

@@ -101,7 +101,7 @@
                       <li><a
                           [href]="'https://'+(properties.environment =='beta' || properties.environment =='development'?'beta.':'')+'monitor.openaire.eu'"
                           target="_blank">Monitor</a></li>
-                      <li><a href="https://graph.openaire.eu/develop/" target="_blank">Develop</a></li>
+                        <li><a href="'https://'+(properties.environment =='beta' || properties.environment =='development'?'beta.':'')+'develop.openaire.eu" target="_blank">Develop</a></li>
                     </ul>
                   </div>
                 </div>

utils/authors/showAuthors.component.ts

@@ -19,7 +19,7 @@ import {properties} from "../../../../environments/environment";
 @Component({
   selector: 'showAuthors',
   template: `
-      <ng-template #author_template let-author="author" let-i="i" let-italic="italic">
+      <ng-template #author_template let-author="author" let-i="i" let-italic="italic" let-modal="modal">
         <span *ngIf="isSticky || (!author.orcid && !author.orcid_pending) || !isBrowser" style="margin-right: 5px;"
               [class.uk-text-italic]="italic">
           {{author.fullName + ";"}}
@@ -36,7 +36,7 @@ import {properties} from "../../../../environments/environment";
                 </span>
             </a>
             <div *ngIf="!isMobile" class="default-dropdown uk-margin-remove-top uk-dropdown orcid-dropdown" 
-                 uk-dropdown="mode:click; offset: 4;" style="min-width: 465px !important;" [attr.container]="!modal ? '#modal-container' : true">
+                 uk-dropdown="mode:click; offset: 4; pos: bottom-right" style="min-width: 465px !important;" [attr.container]="'#modal-container'">
                 <ng-container *ngTemplateOutlet="dropdown"></ng-container>
             </div>
             <mobile-dropdown *ngIf="isMobile" [toggle]="toggle">
@@ -112,7 +112,7 @@ import {properties} from "../../../../environments/environment";
       </span>
           <ng-container *ngFor="let author of authors.slice(0, viewAll?authors.length:authorsLimit) let i=index">
               <ng-container
-                      *ngTemplateOutlet="author_template; context: { author: author, i:i, italic: true}"></ng-container>
+                      *ngTemplateOutlet="author_template; context: { author: author, i:i, italic: true, modal: modal}"></ng-container>
           </ng-container>
           <span *ngIf="!showAll && authors && authors.length > authorsLimit" class="uk-text-meta">
         +{{authors.length - authorsLimit | number}} more
@@ -127,18 +127,18 @@ import {properties} from "../../../../environments/environment";
           </div>
       </div>
 
-      <modal-alert *ngIf="!isMobile" #authorsModal>
+      <modal-alert *ngIf="!isMobile && showAll && authors && authors.length > authorsLimit" #authorsModal>
           <div class="uk-text-small uk-text-emphasis uk-grid uk-grid-column-collapse uk-grid-row-small" uk-grid>
               <ng-container *ngFor="let author of authors; let i=index">
-                  <ng-container *ngTemplateOutlet="author_template; context: { author: author, i:i}"></ng-container>
+                  <ng-container *ngTemplateOutlet="author_template; context: { author: author, i:i, modal: authorsModal}"></ng-container>
               </ng-container>
           </div>
       </modal-alert>
 
-      <fs-modal *ngIf="isMobile" #authorsModal classTitle="uk-tile-default uk-border-bottom">
+      <fs-modal *ngIf="isMobile && showAll && authors && authors.length > authorsLimit" #authorsModal classTitle="uk-tile-default uk-border-bottom">
           <div class="uk-text-small uk-text-emphasis uk-grid uk-grid-column-collapse uk-grid-row-small" uk-grid>
               <ng-container *ngFor="let author of authors; let i=index">
-                  <ng-container *ngTemplateOutlet="author_template; context: { author: author, i:i}"></ng-container>
+                  <ng-container *ngTemplateOutlet="author_template; context: { author: author, i:i, modal: authorsModal}"></ng-container>
               </ng-container>
           </div>
       </fs-modal>
@@ -174,6 +174,9 @@ export class ShowAuthorsComponent {
     if (this.modal) {
       this.modal.cancel();
     }
+    if(this.authorsModal) {
+      this.authorsModal.cancel();
+    }
   }
 
   public viewAllClick() {

utils/mobile-dropdown/mobile-dropdown.component.ts

@@ -56,6 +56,7 @@ export class MobileDropdownComponent implements OnInit{
       parent.removeChild(this.element.nativeElement);
       container.append(this.element.nativeElement);
       this.opened = true;
+      this.cdr.markForCheck();
       body.setAttribute('style', 'overflow-y: hidden');
     }
   }