Hide invite and join buttons in case of byInvitation membership.

This commit is contained in:
Konstantinos Triantafyllou 2023-10-10 22:40:55 +03:00
parent 096d601d29
commit 7841e84ca1
6 changed files with 10 additions and 14 deletions

View File

@ -88,8 +88,8 @@ import {LayoutService} from "./openaireLibrary/dashboard/sharedComponents/sideba
</main> </main>
</div> </div>
<div id="joinAndInviteBtn" *ngIf="isClient && communityId && community"> <div id="joinAndInviteBtn" *ngIf="isClient && communityId && community">
<subscribe [communityId]="community.communityId"></subscribe> <subscribe *ngIf="community.isOpen()" [communityId]="community.communityId"></subscribe>
<invite *ngIf="isManager" [longView]="false"></invite> <invite *ngIf="isManager && community.isOpen()" [longView]="false"></invite>
</div> </div>
<!--feedback *ngIf= "isClient && properties" portalName="Connect" [feedbackQuestionaire]=properties.feedbackQuestionaire></feedback--> <!--feedback *ngIf= "isClient && properties" portalName="Connect" [feedbackQuestionaire]=properties.feedbackQuestionaire></feedback-->
<cookie-law *ngIf="isClient" position="bottom"> <cookie-law *ngIf="isClient" position="bottom">

@ -1 +1 @@
Subproject commit 5e4aaab04f89446f956d524469ef2a856f556de5 Subproject commit ff4411d69587e012a274dbd0451ca770d1afb969

View File

@ -2,13 +2,13 @@ import {NgModule} from '@angular/core';
import {RouterModule} from '@angular/router'; import {RouterModule} from '@angular/router';
import {InviteComponent} from './invite.component'; import {InviteComponent} from './invite.component';
import {LoginGuard} from '../../../openaireLibrary/login/loginGuard.guard';
import {PreviousRouteRecorder} from '../../../openaireLibrary/utils/piwik/previousRouteRecorder.guard'; import {PreviousRouteRecorder} from '../../../openaireLibrary/utils/piwik/previousRouteRecorder.guard';
import {ConnectAdminLoginGuard} from "../../../openaireLibrary/connect/communityGuard/connectAdminLoginGuard.guard";
@NgModule({ @NgModule({
imports: [ imports: [
RouterModule.forChild([ RouterModule.forChild([
{ path: '', component: InviteComponent, canActivate: [LoginGuard], canDeactivate: [PreviousRouteRecorder] } { path: '', component: InviteComponent, canActivate: [ConnectAdminLoginGuard], canDeactivate: [PreviousRouteRecorder] }
]) ])
] ]

View File

@ -31,13 +31,11 @@ export class InviteComponent implements OnInit {
private subs: Subscription[] = []; private subs: Subscription[] = [];
constructor( constructor(
private route: ActivatedRoute,
private _router: Router, private _router: Router,
private _meta: Meta, private _meta: Meta,
private helper: HelperService, private helper: HelperService,
private _title: Title, private _title: Title,
private seoService: SEOService, private seoService: SEOService,
private _piwikService: PiwikService,
private userManageService: UserManagementService) { private userManageService: UserManagementService) {
} }
@ -93,6 +91,5 @@ export class InviteComponent implements OnInit {
close(element) { close(element) {
UIkit.dropdown(element).hide(); UIkit.dropdown(element).hide();
this
} }
} }

View File

@ -1,13 +1,12 @@
import {NgModule} from '@angular/core'; import {NgModule} from '@angular/core';
import {InviteRoutingModule} from './invite-routing.module'; import {InviteRoutingModule} from './invite-routing.module';
import {LoginGuard} from '../../../openaireLibrary/login/loginGuard.guard';
import {InviteBasicModule} from "./inviteBasic.module"; import {InviteBasicModule} from "./inviteBasic.module";
import {ConnectAdminLoginGuard} from "../../../openaireLibrary/connect/communityGuard/connectAdminLoginGuard.guard";
@NgModule({ @NgModule({
imports: [InviteBasicModule, InviteRoutingModule], imports: [InviteBasicModule, InviteRoutingModule],
providers: [LoginGuard] providers: [ConnectAdminLoginGuard]
}) })
export class InviteModule { } export class InviteModule { }

@ -1 +1 @@
Subproject commit ac458b5a6d156167d7b6c9005ef1f9cfac75d3ae Subproject commit 2df4b377a3e89b7dd26a011a2e1e1f07fdcedf2a