From a6d3c02aa5d87a3faa9c6215b82d9f4b495bbb18 Mon Sep 17 00:00:00 2001
From: "konstantina.galouni" <kgalouni@di.uoa.gr>
Date: Fri, 3 Jun 2022 18:34:23 +0300
Subject: [PATCH] [Connect & Library | new-theme]: Replaced "Subscribed" badge
 with "Member" text | Renamed "subscriber" filter to "member" in search
 communities page | Fixed "view all" buttons in my communities page. 1.
 browse-community.component.html: Replaced "Subscribed" badge with "Member"
 text | Updated how restricted/private icons are displayed. 2.
 browse-community.component.ts: Updated visibilityIcon map (PRIVATE ->
 incognito icon, RESTRICTED -> restricted icon). 3.
 browse-community.module.ts: iconsService.registerIcons([incognito,
 restricted]). 4. communities.component.html & my-communities.component.html:
 Added uk-button class in "View all" button for communities. 5.
 portal-search-result.component.html: Replaced "Subscribed" badge with
 "Member" text. 6. searchCommunities.component.ts: Renamed "subscriber" filter
 to "member".

---
 .../browse-community.component.html           | 16 +++++++-------
 .../browse-community.component.ts             |  4 ++--
 .../browse-community.module.ts                |  8 ++++++-
 .../communities/communities.component.html    |  2 +-
 .../my-communities.component.html             | 22 +++++++++----------
 src/app/openaireLibrary                       |  2 +-
 .../searchCommunities.component.ts            |  6 ++---
 7 files changed, 33 insertions(+), 27 deletions(-)

diff --git a/src/app/communities/browseCommunity/browse-community.component.html b/src/app/communities/browseCommunity/browse-community.component.html
index 4292e8b..8b6a4fb 100644
--- a/src/app/communities/browseCommunity/browse-community.component.html
+++ b/src/app/communities/browseCommunity/browse-community.component.html
@@ -9,18 +9,18 @@
 <ng-template #card>
   <div class="uk-padding">
     <div *ngIf="community.isSubscribed"
-         class="uk-alert-primary portal-card-badge uk-text-center uk-position-top-left uk-padding-small">
-      <span>Subscribed</span>
+         class="uk-text-background uk-text-center uk-position-top-left uk-padding-small uk-text-uppercase uk-text-bold">
+      Member
     </div>
     <div *ngIf="community.status === 'manager'"
-         class="uk-position-top-right uk-margin-small-top uk-margin-right uk-flex uk-flex-middle">
-      <icon [name]="visibilityIcon.get('RESTRICTED')" ratio="0.85" flex="true"></icon>
-      <span class="uk-margin-small-left uk-text-small uk-text-capitalize">restricted</span>
+         class="uk-position-top-right uk-margin-small-top uk-margin-small-right uk-flex uk-flex-column uk-flex-middle">
+      <icon [name]="visibilityIcon.get('RESTRICTED')" ratio="1.2" [flex]="true"></icon>
+      <span class="uk-text-small uk-text-capitalize">restricted</span>
     </div>
     <div *ngIf="community.status === 'hidden'"
-         class="uk-position-top-right uk-margin-small-top uk-margin-right uk-flex uk-flex-middle">
-      <icon [name]="visibilityIcon.get('PRIVATE')" ratio="0.85" flex="true"></icon>
-      <span class="uk-margin-small-left uk-text-small uk-text-capitalize">private</span>
+         class="uk-position-top-right uk-margin-small-top uk-margin-small-right uk-flex uk-flex-column uk-flex-middle">
+      <icon [name]="visibilityIcon.get('PRIVATE')" ratio="1.2" [flex]="true"></icon>
+      <span class="uk-text-small uk-text-capitalize">private</span>
     </div>
 <!--    community-logo-->
   <div class="uk-card-media-top uk-flex uk-flex-center uk-flex-middle uk-height-xsmall
diff --git a/src/app/communities/browseCommunity/browse-community.component.ts b/src/app/communities/browseCommunity/browse-community.component.ts
index 10de810..bcbdd82 100644
--- a/src/app/communities/browseCommunity/browse-community.component.ts
+++ b/src/app/communities/browseCommunity/browse-community.component.ts
@@ -30,8 +30,8 @@ export class BrowseCommunityComponent {
   public directLink: boolean = true;
 
   visibilityIcon: Map<Visibility, string> = new Map<Visibility, string> ([
-    ["PRIVATE", 'lock'],
-    ["RESTRICTED", 'group']
+    ["PRIVATE", 'incognito'],
+    ["RESTRICTED", 'restricted']
   ]);
 
   constructor(private route: ActivatedRoute,
diff --git a/src/app/communities/browseCommunity/browse-community.module.ts b/src/app/communities/browseCommunity/browse-community.module.ts
index 1ac93fb..ac8c7d4 100644
--- a/src/app/communities/browseCommunity/browse-community.module.ts
+++ b/src/app/communities/browseCommunity/browse-community.module.ts
@@ -11,6 +11,8 @@ import {AlertModalModule}         from "../../openaireLibrary/utils/modal/alertM
 import {UrlPrefixModule} from "../../openaireLibrary/utils/pipes/url-prefix.module";
 import {LogoUrlPipeModule} from "../../openaireLibrary/utils/pipes/logoUrlPipe.module";
 import {IconsModule} from "../../openaireLibrary/utils/icons/icons.module";
+import {IconsService} from "../../openaireLibrary/utils/icons/icons.service";
+import {incognito, restricted} from "../../openaireLibrary/utils/icons/icons";
 
 @NgModule({
   imports: [
@@ -26,4 +28,8 @@ import {IconsModule} from "../../openaireLibrary/utils/icons/icons.module";
     BrowseCommunityComponent
   ]
 })
-export class BrowseCommunityModule { }
+export class BrowseCommunityModule {
+  constructor(private iconsService: IconsService) {
+    this.iconsService.registerIcons([incognito, restricted])
+  }
+}
diff --git a/src/app/communities/communities.component.html b/src/app/communities/communities.component.html
index e9b09c7..8b709e0 100644
--- a/src/app/communities/communities.component.html
+++ b/src/app/communities/communities.component.html
@@ -261,7 +261,7 @@
 				</div>
 				<div class="uk-text-center uk-margin-medium-top">
 					<a *ngIf="researchCommunities.length > 3"
-						class="uk-display-inline-block uk-text-uppercase uk-button-text"
+						class="uk-display-inline-block uk-text-uppercase uk-button uk-button-text"
 						routerLinkActive="router-link-active" routerLink="/search/find/communities">
 						<span class="uk-flex uk-flex-middle">
 							<span>View All</span>
diff --git a/src/app/my-communities/my-communities.component.html b/src/app/my-communities/my-communities.component.html
index a0e789f..808f222 100644
--- a/src/app/my-communities/my-communities.component.html
+++ b/src/app/my-communities/my-communities.component.html
@@ -26,13 +26,13 @@
                       </div>
                     </div>
                   </div>
-                  <div *ngIf="managerOfCommunities.length > 4" class="uk-text-center uk-margin-medium-top">
-                    <a class="uk-margin-large-top uk-display-inline-block uk-text-uppercase uk-button-text"
+                  <div *ngIf="managerOfCommunities.length > 4" class="uk-text-center uk-margin-large-top">
+                    <a class="uk-display-inline-block uk-text-uppercase uk-button uk-button-text"
                        routerLinkActive="router-link-active" routerLink="/search/find/communities"
                        [queryParams]="{role: quote('manager')}">
-                          <span class="uk-flex uk-flex-middle">
-                            <span>View All ({{managerOfCommunities.length}})</span>
-                          </span>
+                      <span class="uk-flex uk-flex-middle">
+                        <span>View All ({{managerOfCommunities.length}})</span>
+                      </span>
                     </a>
                   </div>
                 </div>
@@ -45,15 +45,15 @@
                       </div>
                     </div>
                   </div>
-                </div>
-                <div *ngIf="managerOfCommunities.length > 3" class="uk-text-center uk-margin-medium-top">
-                  <a class="uk-hidden@xl uk-display-inline-block uk-text-uppercase uk-button-text"
-                     routerLinkActive="router-link-active" routerLink="/search/find/communities"
-                     [queryParams]="{role: quote('manager')}">
+                  <div *ngIf="managerOfCommunities.length > 3" class="uk-text-center uk-margin-large-top">
+                    <a class="uk-display-inline-block uk-text-uppercase uk-button uk-button-text"
+                       routerLinkActive="router-link-active" routerLink="/search/find/communities"
+                       [queryParams]="{role: quote('manager')}">
                       <span class="uk-flex uk-flex-middle">
                         <span>View All ({{managerOfCommunities.length}})</span>
                       </span>
-                  </a>
+                    </a>
+                  </div>
                 </div>
               </div>
             </div>
diff --git a/src/app/openaireLibrary b/src/app/openaireLibrary
index b88c65a..658c96b 160000
--- a/src/app/openaireLibrary
+++ b/src/app/openaireLibrary
@@ -1 +1 @@
-Subproject commit b88c65a3430a3689770e40e1e6f34d8bb10b86c3
+Subproject commit 658c96bb02308e0dec08178ce269fb4b14475bb8
diff --git a/src/app/searchPages/communities/searchCommunities.component.ts b/src/app/searchPages/communities/searchCommunities.component.ts
index 92bf3e0..3a884fd 100644
--- a/src/app/searchPages/communities/searchCommunities.component.ts
+++ b/src/app/searchPages/communities/searchCommunities.component.ts
@@ -336,7 +336,7 @@ export class SearchCommunitiesComponent {
                 break;
               }
             }
-            if (value.replace(/["']/g, "") == 'subscriber') {
+            if (value.replace(/["']/g, "") == 'member') {
               if (this.results[i].isSubscribed) {
                 results.push(this.results[i]);
                 break;
@@ -476,8 +476,8 @@ export class SearchCommunitiesComponent {
       value_original_ids.push(["public", "restricted", "private"]);
       filter_names.push("Role");
       filter_ids.push("role");
-      value_names.push(["Manager", "Subscriber"]);
-      value_original_ids.push(["manager", "subscriber"]);
+      value_names.push(["Manager", "Member"]);
+      value_original_ids.push(["manager", "member"]);
     }
     let filters: Filter[] = [];
     for (let i = 0; i < filter_names.length; i++) {