From 7841e84ca1da3d2657dd27bbf5bc6a3e64cb4ac7 Mon Sep 17 00:00:00 2001
From: "k.triantafyllou" <k.triantafyllou@di.uoa.gr>
Date: Tue, 10 Oct 2023 22:40:55 +0300
Subject: [PATCH] Hide invite and join buttons in case of byInvitation
 membership.

---
 src/app/app.component.ts                                | 4 ++--
 src/app/openaireLibrary                                 | 2 +-
 src/app/utils/subscribe/invite/invite-routing.module.ts | 4 ++--
 src/app/utils/subscribe/invite/invite.component.ts      | 3 ---
 src/app/utils/subscribe/invite/invite.module.ts         | 9 ++++-----
 src/assets/openaire-theme                               | 2 +-
 6 files changed, 10 insertions(+), 14 deletions(-)

diff --git a/src/app/app.component.ts b/src/app/app.component.ts
index b1db9f0..c3ef039 100644
--- a/src/app/app.component.ts
+++ b/src/app/app.component.ts
@@ -88,8 +88,8 @@ import {LayoutService} from "./openaireLibrary/dashboard/sharedComponents/sideba
         </main>
       </div>
       <div id="joinAndInviteBtn" *ngIf="isClient && communityId && community">
-        <subscribe [communityId]="community.communityId"></subscribe>
-        <invite *ngIf="isManager" [longView]="false"></invite>
+        <subscribe *ngIf="community.isOpen()" [communityId]="community.communityId"></subscribe>
+        <invite *ngIf="isManager && community.isOpen()" [longView]="false"></invite>
       </div>
       <!--feedback *ngIf= "isClient && properties" portalName="Connect" [feedbackQuestionaire]=properties.feedbackQuestionaire></feedback-->
       <cookie-law *ngIf="isClient" position="bottom">
diff --git a/src/app/openaireLibrary b/src/app/openaireLibrary
index 5e4aaab..ff4411d 160000
--- a/src/app/openaireLibrary
+++ b/src/app/openaireLibrary
@@ -1 +1 @@
-Subproject commit 5e4aaab04f89446f956d524469ef2a856f556de5
+Subproject commit ff4411d69587e012a274dbd0451ca770d1afb969
diff --git a/src/app/utils/subscribe/invite/invite-routing.module.ts b/src/app/utils/subscribe/invite/invite-routing.module.ts
index c23d9d3..01cf3cc 100644
--- a/src/app/utils/subscribe/invite/invite-routing.module.ts
+++ b/src/app/utils/subscribe/invite/invite-routing.module.ts
@@ -2,13 +2,13 @@ import {NgModule} from '@angular/core';
 import {RouterModule} from '@angular/router';
 
 import {InviteComponent} from './invite.component';
-import {LoginGuard} from '../../../openaireLibrary/login/loginGuard.guard';
 import {PreviousRouteRecorder} from '../../../openaireLibrary/utils/piwik/previousRouteRecorder.guard';
+import {ConnectAdminLoginGuard} from "../../../openaireLibrary/connect/communityGuard/connectAdminLoginGuard.guard";
 
 @NgModule({
   imports: [
     RouterModule.forChild([
-     	{ path: '', component: InviteComponent, canActivate: [LoginGuard], canDeactivate: [PreviousRouteRecorder] }
+     	{ path: '', component: InviteComponent, canActivate: [ConnectAdminLoginGuard], canDeactivate: [PreviousRouteRecorder] }
 
     ])
   ]
diff --git a/src/app/utils/subscribe/invite/invite.component.ts b/src/app/utils/subscribe/invite/invite.component.ts
index de4d80c..935715f 100644
--- a/src/app/utils/subscribe/invite/invite.component.ts
+++ b/src/app/utils/subscribe/invite/invite.component.ts
@@ -31,13 +31,11 @@ export class InviteComponent implements OnInit {
   private subs: Subscription[] = [];
   
   constructor(
-    private route: ActivatedRoute,
     private _router: Router,
     private _meta: Meta,
     private helper: HelperService,
     private _title: Title,
     private seoService: SEOService,
-    private _piwikService: PiwikService,
     private userManageService: UserManagementService) {
   }
   
@@ -93,6 +91,5 @@ export class InviteComponent implements OnInit {
   
   close(element) {
     UIkit.dropdown(element).hide();
-    this
   }
 }
diff --git a/src/app/utils/subscribe/invite/invite.module.ts b/src/app/utils/subscribe/invite/invite.module.ts
index ebb20e0..f947a41 100644
--- a/src/app/utils/subscribe/invite/invite.module.ts
+++ b/src/app/utils/subscribe/invite/invite.module.ts
@@ -1,13 +1,12 @@
-import {NgModule}                   from '@angular/core';
+import {NgModule} from '@angular/core';
 
-import {InviteRoutingModule}        from './invite-routing.module';
-
-import {LoginGuard} from '../../../openaireLibrary/login/loginGuard.guard';
+import {InviteRoutingModule} from './invite-routing.module';
 import {InviteBasicModule} from "./inviteBasic.module";
+import {ConnectAdminLoginGuard} from "../../../openaireLibrary/connect/communityGuard/connectAdminLoginGuard.guard";
 
 @NgModule({
   imports: [InviteBasicModule, InviteRoutingModule],
-  providers: [LoginGuard]
+  providers: [ConnectAdminLoginGuard]
 })
 
 export class InviteModule { }
diff --git a/src/assets/openaire-theme b/src/assets/openaire-theme
index ac458b5..2df4b37 160000
--- a/src/assets/openaire-theme
+++ b/src/assets/openaire-theme
@@ -1 +1 @@
-Subproject commit ac458b5a6d156167d7b6c9005ef1f9cfac75d3ae
+Subproject commit 2df4b377a3e89b7dd26a011a2e1e1f07fdcedf2a