diff --git a/connect/community/communityInfo.ts b/connect/community/communityInfo.ts index b7685e40..7b70f6fa 100644 --- a/connect/community/communityInfo.ts +++ b/connect/community/communityInfo.ts @@ -11,4 +11,6 @@ export class CommunityInfo { subjects: string[]; status:string; zenodoCommunity:string; + isSubscribed: boolean; + isManager: boolean; } diff --git a/searchPages/searchUtils/communitySearchResults.component.html b/searchPages/searchUtils/communitySearchResults.component.html index 6895f96c..98307aef 100644 --- a/searchPages/searchUtils/communitySearchResults.component.html +++ b/searchPages/searchUtils/communitySearchResults.component.html @@ -2,38 +2,38 @@
  • - +
    Subscribed
    - {{(result.community.title)?result.community.title:result.community.shortTitle}} logo - + {{(result.title)?result.title:result.shortTitle}} logo + -
    +
    Private
    -
    - - {{(result.community.title)?result.community.title:result.community.shortTitle}} + -
    -
    - {{_formatDescription(result.community.description)}} +
    +
    + {{_formatDescription(result.description)}}
    - Creation Date: - {{result.community.date | date:'dd-MM-yyyy'}} + Creation Date: + {{result.date | date:'dd-MM-yyyy'}}
    - Type: - {{(result.community.type == 'ri')? 'Research Initiative': 'Research Community'}} + Type: + {{(result.type == 'ri')? 'Research Initiative': 'Research '}}
    diff --git a/searchPages/searchUtils/communitySearchResults.component.ts b/searchPages/searchUtils/communitySearchResults.component.ts index 7a118a0c..83027242 100644 --- a/searchPages/searchUtils/communitySearchResults.component.ts +++ b/searchPages/searchUtils/communitySearchResults.component.ts @@ -2,7 +2,6 @@ import {Component, Input, ViewChild} from '@angular/core'; import {ErrorCodes} from '../../utils/properties/errorCodes'; import {RouterHelper} from '../../utils/routerHelper.class'; import{EnvProperties} from '../../utils/properties/env-properties'; -import {SearchResult} from "../../utils/entities/searchResult"; import {CommunityInfo} from "../../connect/community/communityInfo"; import {Router} from "@angular/router"; @Component({ @@ -11,7 +10,7 @@ import {Router} from "@angular/router"; }) export class CommunitySearchResultsComponent { - @Input() results: SearchResult[]; + @Input() results: CommunityInfo[]; @Input() status: number; @Input() type: string; @Input() showLoading: boolean = false; diff --git a/utils/entities/searchResult.ts b/utils/entities/searchResult.ts index c3c7ddc7..cafcd843 100644 --- a/utils/entities/searchResult.ts +++ b/utils/entities/searchResult.ts @@ -52,11 +52,6 @@ export class SearchResult { entityType: string; types: string[]; - // communities - community: CommunityInfo; - isSubscribed: boolean; - isManager: boolean; - constructor(){} } diff --git a/utils/modal/alert.ts b/utils/modal/alert.ts index 200df72e..fc4472b0 100644 --- a/utils/modal/alert.ts +++ b/utils/modal/alert.ts @@ -17,10 +17,10 @@ import {Component, ViewEncapsulation, ElementRef, EventEmitter, Output} from '@a
    - + - +
    @@ -28,7 +28,7 @@ import {Component, ViewEncapsulation, ElementRef, EventEmitter, Output} from '@a - +