MaDgIK
/
openaire-library
13
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

update status field values with PUBLIC, RESTRICTED, PRIVATE 

add methods isPublic, isRestricted, isPrivate instead of using the previous checks
This commit is contained in:
argirok 2023-07-18 14:26:12 +03:00
parent 1355f2cdb5
commit 7354d0ad55
3 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
connect/community/community.service.ts
View File

@ -98,14 +98,14 @@ export class CommunityService {
community.description = resData.description;
community.date = resData.creationDate;
community.zenodoCommunity = resData.zenodoCommunity;
community.status = 'all';
community.status = 'PUBLIC';
community.type = resData.type;
community.otherZenodoCommunities = resData.otherZenodoCommunities;
if (resData.hasOwnProperty('status')) {
community.status = resData.status;
const status = ['all', 'hidden', 'manager'];
if (status.indexOf(community['status']) === -1) {
community.status = 'hidden';
if(!( community.isPrivate() || community.isRestricted() || community.isPublic())) {
community.status = 'PRIVATE';
}
}
if (resData.subjects != null) {

11
connect/community/communityInfo.ts
View File

@ -14,7 +14,7 @@ export class CommunityInfo {
managers: string[];
date:Date;
subjects: string[];
status:string;
status:"all" | "manager" | "hidden" | "PUBLIC" | "RESTRICTED" | "PRIVATE";
zenodoCommunity:string;
otherZenodoCommunities: string[];
isUpload: boolean;
@ -34,5 +34,14 @@ export class CommunityInfo {
}
return response;
}
public isPublic(){
return this.status == "all" || this.status == "PUBLIC";
}
public isRestricted(){
return this.status == "manager" || this.status == "RESTRICTED";
}
public isPrivate(){
return this.status == "hidden" || this.status == "PRIVATE";
}
}
// export const prodReadyCommunities = ["dh-ch", "ee", "fam", "mes", "ni", "covid-19", "dariah", "epos", "egi"];

2
connect/connectHelper.ts
View File

@ -54,6 +54,6 @@ export class ConnectHelper {
public static isPrivate(community, user) {
return community && (community.status == "hidden" || (community.status == "manager" && !(Session.isPortalAdministrator(user) || Session.isCommunityCurator(user) || Session.isManager("community", community.communityId, user))))
return community && (community.isPrivate() || (community.isRestricted() && !(Session.isPortalAdministrator(user) || Session.isCommunityCurator(user) || Session.isManager("community", community.communityId, user))))
}
}