Properties: update files with latest properties

Sidebar: Remove "manage" word in sidebar
	add link to invite & notifications settings

Dashboard: Remove "manage" word

Stats: enable/disable all fix issue

Zenodo communities:
	add loading
	add remove button for newly aded communities



git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-admin-portal/trunk@54208 d315682c-612b-4755-9ff5-7f18f6832af3
This commit is contained in:
argiro.kokogiannaki 2018-12-07 14:09:23 +00:00
parent 6476128775
commit 70acf2df7d
9 changed files with 108 additions and 73 deletions

View File

@ -4,9 +4,9 @@
"useCache" : true, "useCache" : true,
"metricsAPIURL" : "https://beta.services.openaire.eu/usagestats/", "metricsAPIURL" : "https://beta.services.openaire.eu/usagestats/",
"framesAPIURL" : "https://beta.openaire.eu/stats3/", "framesAPIURL" : "https://beta.openaire.eu/stats3/",
"claimsAPIURL" : "https://beta.services.openaire.eu/claims/rest/claimsService/",
"statisticsAPIURL" : "https://beta.services.openaire.eu/stats-api/", "statisticsAPIURL" : "https://beta.services.openaire.eu/stats-api/",
"statisticsFrameAPIURL":"https://beta.openaire.eu/stats/", "statisticsFrameAPIURL":"https://beta.openaire.eu/stats/",
"claimsAPIURL" : "https://beta.services.openaire.eu/claims/rest/claimsService/",
"searchAPIURLLAst" : "https://beta.services.openaire.eu/search/v2/api/", "searchAPIURLLAst" : "https://beta.services.openaire.eu/search/v2/api/",
"searchResourcesAPIURL" : "https://beta.services.openaire.eu/search/v2/api/resources", "searchResourcesAPIURL" : "https://beta.services.openaire.eu/search/v2/api/resources",
"csvAPIURL" : "https://beta.services.openaire.eu/search/v2/api/reports", "csvAPIURL" : "https://beta.services.openaire.eu/search/v2/api/reports",
@ -19,6 +19,7 @@
"pmcURL" : "http://europepmc.org/articles/", "pmcURL" : "http://europepmc.org/articles/",
"handleURL" : "http://hdl.handle.net/", "handleURL" : "http://hdl.handle.net/",
"zenodo" : "https://zenodo.org/", "zenodo" : "https://zenodo.org/",
"zenodoCommunities" : "https://zenodo.org/api/communities/",
"openAccess" : "https://www.openaire.eu/support/faq#article-id-234", "openAccess" : "https://www.openaire.eu/support/faq#article-id-234",
"openAccessRepo" : "https://www.openaire.eu/support/faq#article-id-310", "openAccessRepo" : "https://www.openaire.eu/support/faq#article-id-310",
"fp7Guidlines" : "https://www.openaire.eu/open-access-in-fp7-seventh-research-framework-programme", "fp7Guidlines" : "https://www.openaire.eu/open-access-in-fp7-seventh-research-framework-programme",
@ -48,7 +49,6 @@
"adminToolsAPIURL" :"https://beta.services.openaire.eu/uoa-admin-tools/", "adminToolsAPIURL" :"https://beta.services.openaire.eu/uoa-admin-tools/",
"adminToolsCommunity" :"openaire", "adminToolsCommunity" :"openaire",
"communityAPI": "https://beta.services.openaire.eu/openaire/community/", "communityAPI": "https://beta.services.openaire.eu/openaire/community/",
"miningBackendURL": "https://beta.services.openaire.eu/interactive-mining", "miningBackendURL": "https://beta.services.openaire.eu/interactive-mining",
@ -85,5 +85,15 @@
"searchLinkToAdvancedSoftware" : "/search/advanced/software", "searchLinkToAdvancedSoftware" : "/search/advanced/software",
"searchLinkToAdvancedDataProviders" : "/search/advanced/dataproviders", "searchLinkToAdvancedDataProviders" : "/search/advanced/dataproviders",
"searchLinkToAdvancedOrganizations" : "/search/advanced/organizations", "searchLinkToAdvancedOrganizations" : "/search/advanced/organizations",
"searchLinkToAdvancedPeople" : "/search/advanced/people" "searchLinkToAdvancedPeople" : "/search/advanced/people",
"sendMailUrl": "https://beta.services.openaire.eu/uoa-admin-tools/sendMail",
"notifyForNewManagers": "https://beta.services.openaire.eu/uoa-admin-tools/notifyForNewManagers/",
"notifyForNewSubscribers": "https://beta.services.openaire.eu/uoa-admin-tools/notifyForNewSubscribers/",
"lastIndexInformationLink" : "https://beta.openaire.eu/aggregation-and-content-provision-workflows",
"showLastIndexInformationLink" : true,
"widgetLink" : "https://beta.openaire.eu/index.php?option=com_openaire&view=widget&format=raw&projectId=",
"claimsInformationLink": "https://beta.openaire.eu/linking"
} }

View File

@ -4,9 +4,9 @@
"useCache" : true, "useCache" : true,
"metricsAPIURL" : "https://services.openaire.eu/usagestats/", "metricsAPIURL" : "https://services.openaire.eu/usagestats/",
"framesAPIURL" : "https://www.openaire.eu/stats3/", "framesAPIURL" : "https://www.openaire.eu/stats3/",
"claimsAPIURL" : "https://services.openaire.eu/claims/rest/claimsService/",
"statisticsAPIURL" : "https://beta.services.openaire.eu/stats-api/", "statisticsAPIURL" : "https://beta.services.openaire.eu/stats-api/",
"statisticsFrameAPIURL":"https://www.openaire.eu/stats/", "statisticsFrameAPIURL":"https://www.openaire.eu/stats/",
"claimsAPIURL" : "https://services.openaire.eu/claims/rest/claimsService/",
"searchAPIURLLAst" : "https://services.openaire.eu/search/v2/api/", "searchAPIURLLAst" : "https://services.openaire.eu/search/v2/api/",
"searchResourcesAPIURL" : "https://services.openaire.eu/search/v2/api/resources", "searchResourcesAPIURL" : "https://services.openaire.eu/search/v2/api/resources",
"csvAPIURL" : "https://services.openaire.eu/search/v2/api/reports", "csvAPIURL" : "https://services.openaire.eu/search/v2/api/reports",
@ -19,6 +19,7 @@
"pmcURL" : "http://europepmc.org/articles/", "pmcURL" : "http://europepmc.org/articles/",
"handleURL" : "http://hdl.handle.net/", "handleURL" : "http://hdl.handle.net/",
"zenodo" : "https://zenodo.org/", "zenodo" : "https://zenodo.org/",
"zenodoCommunities" : "https://zenodo.org/api/communities/",
"openAccess" : "https://www.openaire.eu/support/faq#article-id-234", "openAccess" : "https://www.openaire.eu/support/faq#article-id-234",
"openAccessRepo" : "https://www.openaire.eu/support/faq#article-id-310", "openAccessRepo" : "https://www.openaire.eu/support/faq#article-id-310",
"fp7Guidlines" : "https://www.openaire.eu/open-access-in-fp7-seventh-research-framework-programme", "fp7Guidlines" : "https://www.openaire.eu/open-access-in-fp7-seventh-research-framework-programme",
@ -48,7 +49,6 @@
"adminToolsAPIURL" :"https://services.openaire.eu/uoa-admin-tools/", "adminToolsAPIURL" :"https://services.openaire.eu/uoa-admin-tools/",
"adminToolsCommunity" :"openaire", "adminToolsCommunity" :"openaire",
"communityAPI": "https://services.openaire.eu/openaire/community/", "communityAPI": "https://services.openaire.eu/openaire/community/",
"miningBackendURL": "https://beta.services.openaire.eu/interactive-mining", "miningBackendURL": "https://beta.services.openaire.eu/interactive-mining",
@ -85,5 +85,15 @@
"searchLinkToAdvancedSoftware" : "/search/advanced/software", "searchLinkToAdvancedSoftware" : "/search/advanced/software",
"searchLinkToAdvancedDataProviders" : "/search/advanced/dataproviders", "searchLinkToAdvancedDataProviders" : "/search/advanced/dataproviders",
"searchLinkToAdvancedOrganizations" : "/search/advanced/organizations", "searchLinkToAdvancedOrganizations" : "/search/advanced/organizations",
"searchLinkToAdvancedPeople" : "/search/advanced/people" "searchLinkToAdvancedPeople" : "/search/advanced/people",
"sendMailUrl": "https://services.openaire.eu/uoa-admin-tools/sendMail",
"notifyForNewManagers": "https://services.openaire.eu/uoa-admin-tools/notifyForNewManagers/",
"notifyForNewSubscribers": "https://services.openaire.eu/uoa-admin-tools/notifyForNewSubscribers/",
"lastIndexInformationLink" : "https://www.openaire.eu/aggregation-and-content-provision-workflows",
"showLastIndexInformationLink" : true,
"widgetLink" : "https://www.openaire.eu/index.php?option=com_openaire&view=widget&format=raw&projectId=",
"claimsInformationLink": "https://www.openaire.eu/linking"
} }

View File

@ -1,4 +1,4 @@
<navbar *ngIf= "properties" portal="connect-admin" logoPath="assets/imgs/" onlyTop=false userMenu=true [userMenuItems]=userMenuItems [menuItems]=menuItems [(logInUrl)]=logInUrl [(logOutUrl)]=logOutUrl [(community)]=community class="adminMenu"></navbar> <navbar *ngIf= "properties" portal="connect-admin" logoPath="assets/imgs/" [onlyTop]=false [userMenu]=true [homeurl] = false [userMenuItems]=userMenuItems [menuItems]=menuItems [(logInUrl)]=logInUrl [(logOutUrl)]=logOutUrl [(community)]=community class="adminMenu"></navbar>
<div id="wrapper" class="uk-section uk-margin-top uk-padding-remove-bottom"> <div id="wrapper" class="uk-section uk-margin-top uk-padding-remove-bottom">
@ -9,13 +9,13 @@
<a routerLink="/dashboard" [queryParams]="{communityId: this.communityId}" routerLinkActive="active"> <a routerLink="/dashboard" [queryParams]="{communityId: this.communityId}" routerLinkActive="active">
<span><span class="uk-margin-small-right uk-icon" uk-icon="home"></span> Dashboard</span> <span><span class="uk-margin-small-right uk-icon" uk-icon="home"></span> Overview</span>
</a> </a>
</li> </li>
<li *ngIf="communityId != 'openaire'" class="uk-nav-header uk-parent"> <li *ngIf="communityId != 'openaire'" class="uk-nav-header uk-parent">
<span class="uk-margin-small-right uk-icon" uk-icon="album"></span> <span class="uk-margin-small-right uk-icon" uk-icon="album"></span>
Manage community Community
<ul class="uk-nav-sub"> <ul class="uk-nav-sub">
<li *ngIf="isPortalAdministrator"> <li *ngIf="isPortalAdministrator">
@ -27,41 +27,41 @@
<li > <li >
<a routerLink="/community-edit-form" routerLinkActive="active" [queryParams]="{communityId: this.communityId}"> <a routerLink="/community-edit-form" routerLinkActive="active" [queryParams]="{communityId: this.communityId}">
<span>Profile</span> <span>Community profile</span>
</a> </a>
</li> </li>
</ul> </ul>
</li> </li>
<li *ngIf="communityId != 'openaire'" class="uk-nav-header uk-parent"> <li *ngIf="communityId != 'openaire'" class="uk-nav-header uk-parent">
<span class="uk-margin-small-right uk-icon" uk-icon="list"></span> <span class="uk-margin-small-right uk-icon" uk-icon="list"></span>
Manage community content Community content
<ul class="uk-nav-sub"> <ul class="uk-nav-sub">
<li> <li>
<a routerLink="/manage-projects" routerLinkActive="active" [queryParams]="{communityId: this.communityId}"> <a routerLink="/manage-projects" routerLinkActive="active" [queryParams]="{communityId: this.communityId}">
<span>Manage projects</span> <span>Projects</span>
</a> </a>
</li> </li>
<li> <li>
<a routerLink="/manage-content-providers" routerLinkActive="active" [queryParams]="{communityId: this.communityId}"> <a routerLink="/manage-content-providers" routerLinkActive="active" [queryParams]="{communityId: this.communityId}">
<span>Manage content providers</span> <span>Content providers</span>
</a> </a>
</li> </li>
<li *ngIf="communityType && communityType != 'ri'"> <li *ngIf="communityType && communityType != 'ri'">
<a routerLink="/manage-subjects" routerLinkActive="active" [queryParams]="{communityId: this.communityId}"> <a routerLink="/manage-subjects" routerLinkActive="active" [queryParams]="{communityId: this.communityId}">
<span>Manage subjects</span> <span>Subjects</span>
</a> </a>
</li> </li>
<li> <li>
<a routerLink="/manage-zenodo-communities" routerLinkActive="active" [queryParams]="{communityId: this.communityId}"> <a routerLink="/manage-zenodo-communities" routerLinkActive="active" [queryParams]="{communityId: this.communityId}">
<span>Manage zenodo communities</span> <span>Zenodo communities</span>
</a> </a>
</li> </li>
</ul> </ul>
</li> </li>
<li *ngIf="isPortalAdministrator" class="uk-nav-header uk-parent"> <li *ngIf="isPortalAdministrator" class="uk-nav-header uk-parent">
Manage classes for help text Classes for help text
<ul class="uk-nav-sub"> <ul class="uk-nav-sub">
<li> <li>
@ -74,7 +74,7 @@
</li> </li>
<li class="uk-nav-header uk-parent"> <li class="uk-nav-header uk-parent">
<span uk-icon="world" class="uk-icon"></span> <span uk-icon="world" class="uk-icon"></span>
Manage entities & pages Entities & pages
<ul class="uk-nav-sub"> <ul class="uk-nav-sub">
<li> <li>
@ -91,32 +91,32 @@
<li> <li>
<a routerLink="/pages" routerLinkActive="active" [queryParams]="{type: 'search', communityId: this.communityId}" [routerLinkActiveOptions]="{exact:true}"> <a routerLink="/pages" routerLinkActive="active" [queryParams]="{type: 'search', communityId: this.communityId}" [routerLinkActiveOptions]="{exact:true}">
<span>Search pages</span> <span>Search</span>
</a> </a>
</li> </li>
<li> <li>
<a routerLink="/pages" routerLinkActive="active" [queryParams]="{type: 'link', communityId: this.communityId}" [routerLinkActiveOptions]="{exact:true}"> <a routerLink="/pages" routerLinkActive="active" [queryParams]="{type: 'link', communityId: this.communityId}" [routerLinkActiveOptions]="{exact:true}">
<span>Link pages</span> <span>Link</span>
</a> </a>
</li> </li>
<li> <li>
<a routerLink="/pages" routerLinkActive="active" [queryParams]="{type: 'share', communityId: this.communityId}" [routerLinkActiveOptions]="{exact:true}"> <a routerLink="/pages" routerLinkActive="active" [queryParams]="{type: 'share', communityId: this.communityId}" [routerLinkActiveOptions]="{exact:true}">
<span>Share pages</span> <span>Share</span>
</a> </a>
</li> </li>
<li> <li>
<a routerLink="/pages" routerLinkActive="active" [queryParams]="{type: 'landing', communityId: this.communityId}" [routerLinkActiveOptions]="{exact:true}"> <a routerLink="/pages" routerLinkActive="active" [queryParams]="{type: 'landing', communityId: this.communityId}" [routerLinkActiveOptions]="{exact:true}">
<span>Landing pages</span> <span>Landing</span>
</a> </a>
</li> </li>
<li> <li>
<a routerLink="/pages" routerLinkActive="active" [queryParams]="{type: 'html', communityId: this.communityId}" [routerLinkActiveOptions]="{exact:true}"> <a routerLink="/pages" routerLinkActive="active" [queryParams]="{type: 'html', communityId: this.communityId}" [routerLinkActiveOptions]="{exact:true}">
<span>Html pages</span> <span>Html</span>
</a> </a>
</li> </li>
<li> <li>
<a routerLink="/pages" routerLinkActive="active" [queryParams]="{type: 'other', communityId: this.communityId}" [routerLinkActiveOptions]="{exact:true}"> <a routerLink="/pages" routerLinkActive="active" [queryParams]="{type: 'other', communityId: this.communityId}" [routerLinkActiveOptions]="{exact:true}">
<span>Other pages</span> <span>Other</span>
</a> </a>
</li> </li>
</ul> </ul>
@ -127,7 +127,7 @@
</li> </li>
<li class="uk-nav-header uk-parent"> <li class="uk-nav-header uk-parent">
<span class="uk-margin-small-right uk-icon" uk-icon="file-edit"></span> <span class="uk-margin-small-right uk-icon" uk-icon="file-edit"></span>
Manage help texts Help texts
<ul class="uk-nav-sub"> <ul class="uk-nav-sub">
<li> <li>
@ -148,7 +148,7 @@
<a routerLink="/stats" [queryParams]="{communityId: this.communityId}" routerLinkActive="active"> <a routerLink="/stats" [queryParams]="{communityId: this.communityId}" routerLinkActive="active">
<span><span class="uk-margin-small-right uk-icon" uk-icon="image"></span> Manage statistics & charts</span> <span><span class="uk-margin-small-right uk-icon" uk-icon="image"></span> Statistics & charts</span>
</a> </a>
</li> </li>
@ -156,7 +156,7 @@
<a routerLink="/claims" [queryParams]="{communityId: this.communityId}" routerLinkActive="active"> <a routerLink="/claims" [queryParams]="{communityId: this.communityId}" routerLinkActive="active">
<span><span class="uk-margin-small-right uk-icon" uk-icon="link"></span> Manage claims</span> <span><span class="uk-margin-small-right uk-icon" uk-icon="link"></span> Links</span>
</a> </a>
</li> </li>
@ -164,23 +164,28 @@
<a routerLink="/mining/manage-profiles" [queryParams]="{communityId: this.communityId}" routerLinkActive="active"> <a routerLink="/mining/manage-profiles" [queryParams]="{communityId: this.communityId}" routerLinkActive="active">
<span><span class="uk-margin-small-right uk-icon" uk-icon="settings"></span> Manage text mining rules</span> <span><span class="uk-margin-small-right uk-icon" uk-icon="settings"></span> Text mining rules</span>
</a> </a>
</li> </li>
<li *ngIf="communityId != 'openaire'" class="uk-nav-header uk-parent"> <li *ngIf="communityId != 'openaire'" class="uk-nav-header uk-parent">
<span class="uk-margin-small-right uk-icon" uk-icon="user"></span> <span class="uk-margin-small-right uk-icon" uk-icon="user"></span>
Manage users Users
<ul class="uk-nav-sub"> <ul class="uk-nav-sub">
<li> <li>
<a routerLink="/manage-subscribers" routerLinkActive="active" [queryParams]="{communityId: this.communityId}"> <a routerLink="/manage-subscribers" routerLinkActive="active" [queryParams]="{communityId: this.communityId}">
<span>Manage subscribers</span> <span>Subscribers</span>
</a>
</li>
<li>
<a [href]="'https://beta.'+this.communityId+'.openaire.eu/invite'" target="_blank">
<span>Invite to subscribe</span>
</a> </a>
</li> </li>
<li> <li>
<a routerLink="/manage-user-notifications" routerLinkActive="active" [queryParams]="{communityId: this.communityId}"> <a routerLink="/manage-user-notifications" routerLinkActive="active" [queryParams]="{communityId: this.communityId}">
<span>Manage notification settings </span> <span>Notification settings </span>
</a> </a>
</li> </li>

View File

@ -81,7 +81,7 @@ constructor( private route: ActivatedRoute, private propertiesService:Environm
this.community = {id: com.communityId, name: (com.shortTitle)?com.shortTitle:com.title, logoUrl:com.logoUrl}; this.community = {id: com.communityId, name: (com.shortTitle)?com.shortTitle:com.title, logoUrl:com.logoUrl};
this.communityType = com.type; this.communityType = com.type;
this.menuItems= [ this.menuItems= [
{rootItem: new MenuItem("dashboard","Administration Dashboard","/dashboard","/dashboard",false,[],[],{communityId:com.communityId}), {rootItem: new MenuItem("dashboard","Overview","/dashboard","/dashboard",false,[],[],{communityId:com.communityId}),
items: [] items: []
} }
]; ];
@ -94,7 +94,10 @@ constructor( private route: ActivatedRoute, private propertiesService:Environm
]; ];
} }
} }
this.userMenuItems.push(new MenuItem("manage-user-notifications","Manage notification settings","","/manage-user-notifications",false,[],[],{communityId: com.communityId})); if(this.communityId){
this.userMenuItems.push(new MenuItem("manage-user-notifications","Manage notification settings","","/manage-user-notifications",false,[],[],{communityId: this.communityId}));
}
}, },
error => { error => {

View File

@ -6,7 +6,7 @@
<div *ngIf="communityId != 'openaire'" class="uk-card uk-card-default uk-card-body uk-card-hover uk-width-1-3@m uk-first-column"> <div *ngIf="communityId != 'openaire'" class="uk-card uk-card-default uk-card-body uk-card-hover uk-width-1-3@m uk-first-column">
<h3 class="uk-card-title"> <h3 class="uk-card-title">
<span class="uk-margin-small-right uk-icon" uk-icon="album"></span> <span class="uk-margin-small-right uk-icon" uk-icon="album"></span>
Community Profile Profile
</h3> </h3>
<p>Edit community information, change logo url, add community managers or subjects related to community. <p>Edit community information, change logo url, add community managers or subjects related to community.
</p><p><a routerLink="/community-edit-form" [queryParams]="{communityId: this.communityId}" class="uk-button uk-button-text">Edit Community Profile</a></p> </p><p><a routerLink="/community-edit-form" [queryParams]="{communityId: this.communityId}" class="uk-button uk-button-text">Edit Community Profile</a></p>
@ -14,13 +14,14 @@
<div *ngIf="communityId != 'openaire'" class="uk-card uk-card-default uk-card-body uk-card-hover uk-width-1-3@m"> <div *ngIf="communityId != 'openaire'" class="uk-card uk-card-default uk-card-body uk-card-hover uk-width-1-3@m">
<h3 class="uk-card-title"> <h3 class="uk-card-title">
<span class="uk-margin-small-right uk-icon" uk-icon="list"></span> <span class="uk-margin-small-right uk-icon" uk-icon="list"></span>
Manage community content Content
</h3> </h3>
Manage projects and content providers that are related to the research community. Manage projects, content providers{{(communityType && communityType != 'ri')?', subjects':''}} and zenodo communities that are related to the research community.
<p> <p>
<a routerLink="/manage-projects" [queryParams]="{communityId: this.communityId}" class="uk-button uk-button-text">Manage projects</a> <br> <a routerLink="/manage-projects" [queryParams]="{communityId: this.communityId}" class="uk-button uk-button-text">Projects</a> <br>
<a routerLink="/manage-content-providers" [queryParams]="{communityId: this.communityId}" class="uk-button uk-button-text">Manage content providers</a> <br> <a routerLink="/manage-content-providers" [queryParams]="{communityId: this.communityId}" class="uk-button uk-button-text">Content providers</a> <br>
<a *ngIf="communityType && communityType != 'ri'" routerLink="/manage-subjects" [queryParams]="{communityId: this.communityId}" class="uk-button uk-button-text">Manage subjects</a> <br> <a routerLink="/manage-zenodo-communities" [queryParams]="{communityId: this.communityId}" class="uk-button uk-button-text">Zenodo communities</a> <br>
<a *ngIf="communityType && communityType != 'ri'" routerLink="/manage-subjects" [queryParams]="{communityId: this.communityId}" class="uk-button uk-button-text">Subjects</a> <br>
<!--a href="http://scoobydoo.di.uoa.gr/connect/dashboard.html#" class="uk-button uk-button-text">Manage organizations</a--> <!--a href="http://scoobydoo.di.uoa.gr/connect/dashboard.html#" class="uk-button uk-button-text">Manage organizations</a-->
</p> </p>
</div> </div>
@ -31,7 +32,7 @@
</h3> </h3>
<p> Manage statistical numbers & charts that will be displayed in the dashboard and monitor pages. <p> Manage statistical numbers & charts that will be displayed in the dashboard and monitor pages.
<a routerLink="/stats" [queryParams]="{communityId: this.communityId}" class="uk-button uk-button-text">Manage statistics &amp; charts</a> <a routerLink="/stats" [queryParams]="{communityId: this.communityId}" class="uk-button uk-button-text">Statistics &amp; charts</a>
</p> </p>
</div> </div>
@ -39,11 +40,11 @@
<div *ngIf="communityId != 'openaire'" class="uk-card uk-card-default uk-card-body uk-card-hover uk-width-1-3@m"> <div *ngIf="communityId != 'openaire'" class="uk-card uk-card-default uk-card-body uk-card-hover uk-width-1-3@m">
<h3 class="uk-card-title"> <h3 class="uk-card-title">
<span class="uk-margin-small-right uk-icon" uk-icon="link"></span> <span class="uk-margin-small-right uk-icon" uk-icon="link"></span>
Claims Links
</h3> </h3>
Manage user claims related to the research community. Manage user claims related to the research community.
<p> <p>
<a routerLink="/claims" [queryParams]="{communityId: this.communityId}" class="uk-button uk-button-text">Manage claims</a> <a routerLink="/claims" [queryParams]="{communityId: this.communityId}" class="uk-button uk-button-text">Links</a>
</p> </p>
</div> </div>
<div class="uk-card uk-card-default uk-card-body uk-card-hover uk-width-1-3@m"> <div class="uk-card uk-card-default uk-card-body uk-card-hover uk-width-1-3@m">
@ -53,8 +54,8 @@
</h3> </h3>
Add or edit help text in research community pages. Add or edit help text in research community pages.
<p> <p>
<a routerLink="/pageContents" [queryParams]="{communityId: this.communityId}" class="uk-button uk-button-text">Add help texts in pages</a><br> <a routerLink="/pageContents" [queryParams]="{communityId: this.communityId}" class="uk-button uk-button-text">Help texts in pages</a><br>
<a routerLink="/classContents" [queryParams]="{communityId: this.communityId}" class="uk-button uk-button-text">Add help texts in classes</a> <a routerLink="/classContents" [queryParams]="{communityId: this.communityId}" class="uk-button uk-button-text">Help texts in classes</a>
</p> </p>
</div> </div>
<div *ngIf="communityType && communityType == 'ri' && communityId!='openaire'" class="uk-card uk-card-default uk-card-body uk-card-hover uk-width-1-3@m"> <div *ngIf="communityType && communityType == 'ri' && communityId!='openaire'" class="uk-card uk-card-default uk-card-body uk-card-hover uk-width-1-3@m">
@ -64,7 +65,7 @@
</h3> </h3>
Manage text mining rules, test the rules and see the results, save and load mining profiles. Manage text mining rules, test the rules and see the results, save and load mining profiles.
<p> <p>
<a routerLink="/mining/manage-profiles" [queryParams]="{communityId: this.communityId}" class="uk-button uk-button-text">Manage text mining rules</a> <a routerLink="/mining/manage-profiles" [queryParams]="{communityId: this.communityId}" class="uk-button uk-button-text">Text mining rules</a>
</p> </p>
</div> </div>
<div *ngIf="communityId!='openaire'" class="uk-card uk-card-default uk-card-body uk-card-hover uk-width-1-3@m"> <div *ngIf="communityId!='openaire'" class="uk-card uk-card-default uk-card-body uk-card-hover uk-width-1-3@m">
@ -72,9 +73,10 @@
<span class="uk-margin-small-right uk-icon" uk-icon="user"></span> <span class="uk-margin-small-right uk-icon" uk-icon="user"></span>
Users Users
</h3> </h3>
Manage subscibers, invite more users to subscibe, manage your notification settings.
<p> <p>
<a routerLink="/manage-subscribers" routerLinkActive="active" [queryParams]="{communityId: this.communityId}" class="uk-button uk-button-text"> <a routerLink="/manage-subscribers" routerLinkActive="active" [queryParams]="{communityId: this.communityId}" class="uk-button uk-button-text">
<span>Manage subscribers</span> <span>Subscribers</span>
</a> </a>
<br> <br>
<a [href]="'https://beta.'+this.communityId+'.openaire.eu/invite'" target="_blank" class="uk-button uk-button-text"> <a [href]="'https://beta.'+this.communityId+'.openaire.eu/invite'" target="_blank" class="uk-button uk-button-text">
@ -82,7 +84,7 @@
</a> </a>
<br> <br>
<a routerLink="/manage-user-notifications" routerLinkActive="active" [queryParams]="{communityId: this.communityId}" class="uk-button uk-button-text"> <a routerLink="/manage-user-notifications" routerLinkActive="active" [queryParams]="{communityId: this.communityId}" class="uk-button uk-button-text">
<span>Manage notification settings </span> <span>Notification settings </span>
</a> </a>
</p> </p>
</div> </div>

View File

@ -223,7 +223,6 @@ export class StatsComponent implements OnInit {
} else { } else {
this.showLoading = true; this.showLoading = true;
this.updateErrorMessage = ""; this.updateErrorMessage = "";
//this.loadingMessage = 'Saving changes'; //this.loadingMessage = 'Saving changes';
this.showAllInMonitor = !this.showAllInMonitor; this.showAllInMonitor = !this.showAllInMonitor;
@ -233,7 +232,7 @@ export class StatsComponent implements OnInit {
entity, entity,
'charts', 'charts',
'projectColumn', 'projectColumn',
!this.showAllInMonitor, this.showAllInMonitor,
true).subscribe( true).subscribe(
response => console.log(JSON.stringify(response)), response => console.log(JSON.stringify(response)),
error => { error => {
@ -251,7 +250,7 @@ export class StatsComponent implements OnInit {
entity, entity,
'charts', 'charts',
'projectPie', 'projectPie',
!this.showAllInMonitor, this.showAllInMonitor,
true).subscribe( true).subscribe(
response => console.log(JSON.stringify(response)), response => console.log(JSON.stringify(response)),
error => { error => {
@ -269,7 +268,7 @@ export class StatsComponent implements OnInit {
entity, entity,
'charts', 'charts',
'projectTable', 'projectTable',
!this.showAllInMonitor, this.showAllInMonitor,
true).subscribe( true).subscribe(
response => console.log(JSON.stringify(response)), response => console.log(JSON.stringify(response)),
error => { error => {

View File

@ -13,6 +13,14 @@
<span class="uk-margin-small-right uk-icon" uk-icon="warning"></span> <span class="uk-margin-small-right uk-icon" uk-icon="warning"></span>
Newly added Zenodo communities will be linked to your community on the next run of our algorithms. Newly added Zenodo communities will be linked to your community on the next run of our algorithms.
</div> </div>
<div *ngIf="zenodoCommunitySearchUtils.status == errorCodes.LOADING "
class="uk-animation-fade uk-margin-top uk-width-1-1" role="alert">
<span class="loading-gif uk-align-center" ></span>
</div>
<div *ngIf="zenodoCommunitySearchUtils.status == errorCodes.NONE "
class="uk-animation-fade uk-margin-top uk-width-1-1 uk-alert uk-alert-warning" role="alert">
No zenodo communities found
</div>
<div *ngIf="zenodoCommunitySearchUtils.totalResults > 0" class="uk-align-center uk-margin-remove-bottom"> <div *ngIf="zenodoCommunitySearchUtils.totalResults > 0" class="uk-align-center uk-margin-remove-bottom">
<div class="searchPaging uk-panel uk-margin-top uk-grid uk-margin-bottom"> <div class="searchPaging uk-panel uk-margin-top uk-grid uk-margin-bottom">
<span class="uk-h6 uk-width-1-1@s uk-width-1-2@m"> <span class="uk-h6 uk-width-1-1@s uk-width-1-2@m">
@ -41,11 +49,11 @@
</a> </a>
<span *ngIf=" masterCommunity && item.id==masterCommunity.id" class="uk-label uk-label-warning">Master zenodo community</span> <span *ngIf=" masterCommunity && item.id==masterCommunity.id" class="uk-label uk-label-warning">Master zenodo community</span>
<span class="uk-width-1-6 uk-text-center"> <span class="uk-width-1-6 uk-text-center">
<a *ngIf="!inCommunity(item) && !(masterCommunity && item.id==masterCommunity.id)" (click)="addCommunity(item)" class="uk-icon-button add green_background_color green_color" uk-icon="plus" title="Add"></a> <a *ngIf="!inThelist(item, selectedCommunities) && !(masterCommunity && item.id==masterCommunity.id)" (click)="addCommunity(item)" class="uk-icon-button add green_background_color green_color" uk-icon="plus" title="Add"></a>
<span *ngIf="inCommunity(item)" class="uk-label uk-label-success">Added</span> <span *ngIf="inThelist(item, selectedCommunities)" class="uk-label uk-label-success">Added</span>
<!-- <a *ngIf="inCommunity(item)" (click)="removeCommunity(item)" class="uk-icon-button remove red_background_color red_color" uk-icon="close" title="Undo"></a> --> <a *ngIf="inThelist(item, newlySelectedCommunities)" (click)="removeCommunity(item)" class="uk-icon-button remove red_background_color red_color" uk-icon="close" title="Undo"></a>
</span> </span>
</h4> </h4>
<div class="uk-comment-meta "> <div class="uk-comment-meta ">

View File

@ -32,6 +32,7 @@ export class AddZenodoCommunitiesComponent implements OnInit {
public rowsOnPage = 10; public rowsOnPage = 10;
@Input() masterCommunity = null; @Input() masterCommunity = null;
@Input() selectedCommunities = []; @Input() selectedCommunities = [];
newlySelectedCommunities = [];
constructor (private route: ActivatedRoute, constructor (private route: ActivatedRoute,
private _router: Router, private _router: Router,
public _fb: FormBuilder, public _fb: FormBuilder,
@ -49,6 +50,8 @@ export class AddZenodoCommunitiesComponent implements OnInit {
console.info(this._router.url); console.info(this._router.url);
this._router.navigate(['/user-info'], { queryParams: { "errorCode": LoginErrorCodes.NOT_VALID, "redirectUrl": this._router.url} }); this._router.navigate(['/user-info'], { queryParams: { "errorCode": LoginErrorCodes.NOT_VALID, "redirectUrl": this._router.url} });
} else { } else {
this.zenodoCommunitySearchUtils.status = this.errorCodes.LOADING;
this.newlySelectedCommunities = [];
if (this.communityId != null && this.communityId != '') { if (this.communityId != null && this.communityId != '') {
this._zenodoCommunitieService.getZenodoCommunities(this.properties, this.properties.zenodoCommunities+"?page="+this.zenodoCommunitySearchUtils.page+"&size="+this.rowsOnPage).subscribe( this._zenodoCommunitieService.getZenodoCommunities(this.properties, this.properties.zenodoCommunities+"?page="+this.zenodoCommunitySearchUtils.page+"&size="+this.rowsOnPage).subscribe(
result => { result => {
@ -79,6 +82,7 @@ export class AddZenodoCommunitiesComponent implements OnInit {
this._router.navigate(['/user-info'], { queryParams: { "errorCode": LoginErrorCodes.NOT_VALID, "redirectUrl": this._router.url} }); this._router.navigate(['/user-info'], { queryParams: { "errorCode": LoginErrorCodes.NOT_VALID, "redirectUrl": this._router.url} });
} else { } else {
this.zenodoCommunitySearchUtils.page=page; this.zenodoCommunitySearchUtils.page=page;
this.zenodoCommunitySearchUtils.status = this.errorCodes.LOADING;
this._zenodoCommunitieService.getZenodoCommunities(this.properties, this._zenodoCommunitieService.getZenodoCommunities(this.properties,
this.properties.zenodoCommunities+"?page="+this.zenodoCommunitySearchUtils.page this.properties.zenodoCommunities+"?page="+this.zenodoCommunitySearchUtils.page
+"&size="+this.rowsOnPage +"&size="+this.rowsOnPage
@ -124,6 +128,7 @@ export class AddZenodoCommunitiesComponent implements OnInit {
// this.undo[project.id] = data.id; // this.undo[project.id] = data.id;
community["openaireId"]=data.id; community["openaireId"]=data.id;
this.selectedCommunities.push(community); this.selectedCommunities.push(community);
this.newlySelectedCommunities.push(community)
}, },
err => { err => {
console.info("error ADD"); console.info("error ADD");
@ -136,7 +141,7 @@ export class AddZenodoCommunitiesComponent implements OnInit {
} }
} }
/* public removeCommunity( comm) { public removeCommunity( comm) {
if(!Session.isLoggedIn()){ if(!Session.isLoggedIn()){
console.info(this._router.url); console.info(this._router.url);
this._router.navigate(['/user-info'], { queryParams: { "errorCode": LoginErrorCodes.NOT_VALID, "redirectUrl": this._router.url} }); this._router.navigate(['/user-info'], { queryParams: { "errorCode": LoginErrorCodes.NOT_VALID, "redirectUrl": this._router.url} });
@ -144,9 +149,6 @@ export class AddZenodoCommunitiesComponent implements OnInit {
var openaireId = this.getOpenaireId(comm); var openaireId = this.getOpenaireId(comm);
this._manageZenodoCommunitiesService.removeZCommunity(this.properties, this.communityId,openaireId, ).subscribe( this._manageZenodoCommunitiesService.removeZCommunity(this.properties, this.communityId,openaireId, ).subscribe(
data => { data => {
console.log(this.selectedCommunities.length);
console.info("REMOVE: "+ this.communityId + " "+openaireId);
console.log(comm);
var pos = -1; var pos = -1;
for(var i=0; i< this.selectedCommunities.length;i++) { for(var i=0; i< this.selectedCommunities.length;i++) {
console.info(this.selectedCommunities[i].id+ " "+ this.selectedCommunities[i].openaireId+" "+ comm.id); console.info(this.selectedCommunities[i].id+ " "+ this.selectedCommunities[i].openaireId+" "+ comm.id);
@ -155,11 +157,18 @@ export class AddZenodoCommunitiesComponent implements OnInit {
break; break;
} }
} }
console.log(pos);
if(pos != -1){ if(pos != -1){
this.selectedCommunities.splice(pos, 1); this.selectedCommunities.splice(pos, 1);
} }
console.log(this.selectedCommunities.length); for(var i=0; i< this.newlySelectedCommunities.length;i++) {
if( this.newlySelectedCommunities[i].id == comm.id) {
pos= i;
break;
}
}
if(pos != -1){
this.newlySelectedCommunities.splice(pos, 1);
}
}, },
err => { err => {
@ -171,10 +180,10 @@ export class AddZenodoCommunitiesComponent implements OnInit {
} }
) )
} }
}*/ }
public inCommunity(community: any): any { public inThelist(community: any, list): any {
for(let com of this.selectedCommunities) { for(let com of list) {
if(com.id == community.id) { if(com.id == community.id) {
return true; return true;
} }

View File

@ -8,24 +8,16 @@
"statisticsAPIURL" : "https://beta.services.openaire.eu/stats-api/", "statisticsAPIURL" : "https://beta.services.openaire.eu/stats-api/",
"statisticsFrameAPIURL":"https://beta.openaire.eu/stats/", "statisticsFrameAPIURL":"https://beta.openaire.eu/stats/",
"searchAPIURLLAst" : "https://beta.services.openaire.eu/search/v2/api/", "searchAPIURLLAst" : "https://beta.services.openaire.eu/search/v2/api/",
"searchResourcesAPIURL" : "https://beta.services.openaire.eu/search/v2/api/resources", "searchResourcesAPIURL" : "https://beta.services.openaire.eu/search/v2/api/resources",
"csvAPIURL" : "http://rudie.di.uoa.gr:8080/dnet-functionality-services-2.0.0-SNAPSHOT/rest/v2/reports", "csvAPIURL" : "http://rudie.di.uoa.gr:8080/dnet-functionality-services-2.0.0-SNAPSHOT/rest/v2/reports",
"searchCrossrefAPIURL" : "https://api.crossref.org/works", "searchCrossrefAPIURL" : "https://api.crossref.org/works",
"searchDataciteAPIURL" : "https://api.datacite.org/works", "searchDataciteAPIURL" : "https://api.datacite.org/works",
"searchOrcidURL" : "https://pub.orcid.org/", "searchOrcidURL" : "https://pub.orcid.org/",
"pmidURL" : "http://www.ncbi.nlm.nih.gov/pubmed/", "pmidURL" : "http://www.ncbi.nlm.nih.gov/pubmed/",
"doiURL" : "https://dx.doi.org/", "doiURL" : "https://dx.doi.org/",
"cordisURL" : "http://cordis.europa.eu/projects/", "cordisURL" : "http://cordis.europa.eu/projects/",
"pmcURL" : "http://europepmc.org/articles/", "pmcURL" : "http://europepmc.org/articles/",
"handleURL" : "http://hdl.handle.net/", "handleURL" : "http://hdl.handle.net/",
"zenodo" : "https://zenodo.org/", "zenodo" : "https://zenodo.org/",
"zenodoCommunities" : "https://zenodo.org/api/communities/", "zenodoCommunities" : "https://zenodo.org/api/communities/",
"openAccess" : "https://www.openaire.eu/support/faq#article-id-234", "openAccess" : "https://www.openaire.eu/support/faq#article-id-234",
@ -34,14 +26,11 @@
"h2020Guidlines" : "https://www.openaire.eu/oa-publications/h2020/open-access-in-horizon-2020", "h2020Guidlines" : "https://www.openaire.eu/oa-publications/h2020/open-access-in-horizon-2020",
"ercGuidlines" : "http://erc.europa.eu/sites/default/files/document/file/ERC_Open_Access_Guidelines-revised_2014.pdf", "ercGuidlines" : "http://erc.europa.eu/sites/default/files/document/file/ERC_Open_Access_Guidelines-revised_2014.pdf",
"helpdesk" : "https://www.openaire.eu/support/helpdesk", "helpdesk" : "https://www.openaire.eu/support/helpdesk",
"uploadService" : "http://scoobydoo.di.uoa.gr:8000/upload", "uploadService" : "http://scoobydoo.di.uoa.gr:8000/upload",
"vocabulariesAPI" :"https://beta.services.openaire.eu/provision/mvc/vocabularies/", "vocabulariesAPI" :"https://beta.services.openaire.eu/provision/mvc/vocabularies/",
"piwikBaseUrl" :" https://analytics.openaire.eu/piwik.php?idsite=6", "piwikBaseUrl" :" https://analytics.openaire.eu/piwik.php?idsite=6",
"loginUrl" :"http://scoobydoo.di.uoa.gr:8080/dnet-openaire-users-1.0.0-SNAPSHOT/openid_connect_login", "loginUrl" :"http://scoobydoo.di.uoa.gr:8080/dnet-openaire-users-1.0.0-SNAPSHOT/openid_connect_login",
"logoutUrl" :"https://aai.openaire.eu/proxy/saml2/idp/SingleLogoutService.php?ReturnTo=", "logoutUrl" :"https://aai.openaire.eu/proxy/saml2/idp/SingleLogoutService.php?ReturnTo=",