From 0b55b0dcd790f954419025a1ea4e3436a1533636 Mon Sep 17 00:00:00 2001
From: "k.triantafyllou" <k.triantafyllou@di.uoa.gr>
Date: Fri, 12 Nov 2021 12:56:15 +0200
Subject: [PATCH 1/2] Fix get logo Url for communities

---
 .../browseCommunity/browse-community.component.html   | 11 ++++-------
 src/app/communities/communities.component.ts          |  2 +-
 src/app/openaireLibrary                               |  2 +-
 src/assets/common-assets                              |  2 +-
 src/environments/environment.ts                       |  2 +-
 5 files changed, 8 insertions(+), 11 deletions(-)

diff --git a/src/app/communities/browseCommunity/browse-community.component.html b/src/app/communities/browseCommunity/browse-community.component.html
index 7e64374..037b010 100644
--- a/src/app/communities/browseCommunity/browse-community.component.html
+++ b/src/app/communities/browseCommunity/browse-community.component.html
@@ -12,14 +12,11 @@
   <div class="uk-card-media-top uk-padding uk-padding-remove-vertical uk-flex uk-flex-center uk-flex-middle">
     <a *ngIf="directLink" [href]="getCommunityPageUrl()" target="_blank">
       <div class="community">
-        <img *ngIf="community.logoUrl && community.isUpload && community.logoUrl != ''"
-             [src]="properties.utilsService + '/download/' + community.logoUrl"
+        <img *ngIf="community.logoUrl"
+             [src]="community.getLogoUrl()"
              alt="{{(community.title)?community.title:community.shortTitle}} logo">
-        <img *ngIf="community.logoUrl && !community.isUpload && community.logoUrl != ''"
-             [src]="community.logoUrl | urlPrefix"
-             alt="{{(community.title)?community.title:community.shortTitle}} logo">
-        <span *ngIf="community.logoUrl == null || community.logoUrl == ''" class="uk-icon">
-          <svg viewBox="0 0 20 20" xmlns="http://www.w3.org/2000/svg" ratio="2.5"> <circle fill="none" stroke="#000"
+        <span *ngIf="!community.logoUrl" class="uk-icon">
+          <svg viewBox="0 0 20 20" class="uk-width-1-1" xmlns="http://www.w3.org/2000/svg" ratio="2.5"> <circle fill="none" stroke="#000"
                                                                                            stroke-width="1.1" cx="7.7"
                                                                                            cy="8.6" r="3.5"></circle> <path
             fill="none" stroke="#000" stroke-width="1.1"
diff --git a/src/app/communities/communities.component.ts b/src/app/communities/communities.component.ts
index 6d0c425..08446ea 100644
--- a/src/app/communities/communities.component.ts
+++ b/src/app/communities/communities.component.ts
@@ -24,7 +24,7 @@ export class CommunitiesComponent {
   private subscriptions = [];
 
   public pageTitle = "OpenAIRE"
-  public researchCommunities = [];
+  public researchCommunities: CommunityInfo[] = [];
   public gifs: { "gif": string, "header": string, "text" }[] = [];
   public pageContents = null;
   public divContents = null;
diff --git a/src/app/openaireLibrary b/src/app/openaireLibrary
index 3632510..b9e6894 160000
--- a/src/app/openaireLibrary
+++ b/src/app/openaireLibrary
@@ -1 +1 @@
-Subproject commit 3632510e387b3a83f8d8e0f27cd796912a19c741
+Subproject commit b9e6894ba15ee562b433c8e5fe72775eb3a2449d
diff --git a/src/assets/common-assets b/src/assets/common-assets
index 318c656..999d383 160000
--- a/src/assets/common-assets
+++ b/src/assets/common-assets
@@ -1 +1 @@
-Subproject commit 318c6560565a7a0da818385de27ebb430b22aea3
+Subproject commit 999d3833d3805534677aa741a3759e26e09b50f2
diff --git a/src/environments/environment.ts b/src/environments/environment.ts
index 15695d6..2a78b23 100644
--- a/src/environments/environment.ts
+++ b/src/environments/environment.ts
@@ -52,7 +52,7 @@ export let properties: EnvProperties = {
   ercGuidlines: 'http://erc.europa.eu/sites/default/files/document/file/ERC_Open_Access_Guidelines-revised_2014.pdf',
   helpdesk: 'https://www.openaire.eu/support/helpdesk',
   helpdeskEmail: 'helpdesk@openaire.eu',
-  utilsService: 'http://dl170.madgik.di.uoa.gr:8000',
+  utilsService: 'http://mpagasas.di.uoa.gr:8000',
   vocabulariesAPI: 'https://dev-openaire.d4science.org/provision/mvc/vocabularies/',
   piwikBaseUrl: 'https://analytics.openaire.eu/piwik.php?idsite=',
   piwikSiteId: '80',

From 380f307cdd8eddf33cca4c0bc51245a2203f91c9 Mon Sep 17 00:00:00 2001
From: "k.triantafyllou" <k.triantafyllou@di.uoa.gr>
Date: Fri, 12 Nov 2021 14:21:37 +0200
Subject: [PATCH 2/2] Add logoUrl pipe in communities logoUrl

---
 .../browseCommunity/browse-community.component.html            | 2 +-
 src/app/communities/browseCommunity/browse-community.module.ts | 3 ++-
 src/app/openaireLibrary                                        | 2 +-
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/app/communities/browseCommunity/browse-community.component.html b/src/app/communities/browseCommunity/browse-community.component.html
index 037b010..4893ae3 100644
--- a/src/app/communities/browseCommunity/browse-community.component.html
+++ b/src/app/communities/browseCommunity/browse-community.component.html
@@ -13,7 +13,7 @@
     <a *ngIf="directLink" [href]="getCommunityPageUrl()" target="_blank">
       <div class="community">
         <img *ngIf="community.logoUrl"
-             [src]="community.getLogoUrl()"
+             [src]="community | logoUrl"
              alt="{{(community.title)?community.title:community.shortTitle}} logo">
         <span *ngIf="!community.logoUrl" class="uk-icon">
           <svg viewBox="0 0 20 20" class="uk-width-1-1" xmlns="http://www.w3.org/2000/svg" ratio="2.5"> <circle fill="none" stroke="#000"
diff --git a/src/app/communities/browseCommunity/browse-community.module.ts b/src/app/communities/browseCommunity/browse-community.module.ts
index b2de46f..5838017 100644
--- a/src/app/communities/browseCommunity/browse-community.module.ts
+++ b/src/app/communities/browseCommunity/browse-community.module.ts
@@ -9,11 +9,12 @@ import {SearchFormModule}         from '../../openaireLibrary/searchPages/search
 import {ManageModule}             from '../../openaireLibrary/utils/manage/manage.module';
 import {AlertModalModule}         from "../../openaireLibrary/utils/modal/alertModal.module";
 import {UrlPrefixModule} from "../../openaireLibrary/utils/pipes/url-prefix.module";
+import {LogoUrlPipeModule} from "../../openaireLibrary/utils/pipes/logoUrlPipe.module";
 
 @NgModule({
   imports: [
     CommonModule, FormsModule, RouterModule,
-    SearchFormModule, ManageModule, AlertModalModule, UrlPrefixModule
+    SearchFormModule, ManageModule, AlertModalModule, UrlPrefixModule, LogoUrlPipeModule
   ],
   declarations: [
     BrowseCommunityComponent
diff --git a/src/app/openaireLibrary b/src/app/openaireLibrary
index b9e6894..7ef741c 160000
--- a/src/app/openaireLibrary
+++ b/src/app/openaireLibrary
@@ -1 +1 @@
-Subproject commit b9e6894ba15ee562b433c8e5fe72775eb3a2449d
+Subproject commit 7ef741c205a3659e28d1f8521a37e2cc0d969de5