Merge from develop

This commit is contained in:
Konstantinos Triantafyllou 2024-06-20 12:50:28 +03:00
commit 2f6983d8e6
5 changed files with 8 additions and 6 deletions

View File

@ -1,6 +1,6 @@
{
"name": "monitor-dashboard",
"version": "1.0.1",
"version": "1.0.2",
"scripts": {
"ng": "ng",
"start": "ng serve --port 4600 --disable-host-check --host 0.0.0.0",

View File

@ -334,7 +334,7 @@ export class AppComponent extends SidebarBaseComponent implements OnInit {
if (this.isCurator()) {
this.adminMenuItems.push(new MenuItem("admin-tools", "Pages & Entities", "", "/admin/" + this.stakeholder.alias + "/admin-tools/pages", false, [], [], {}, {name: 'description'}, null, "uk-visible@m", "/admin/" + this.stakeholder.alias + "/admin-tools"));
}
if(this.stakeholder.type == "organization") {
if(this.stakeholder.type == "organization" && this.properties.environment != "production") {
this.adminMenuItems.push(new MenuItem("claim", "Link results", "", "/admin/" + this.stakeholder.alias + "/claims/link", false, [], [], {}, {name: 'link', ratio: 1}, null, "uk-visible@m", "/admin/" + this.stakeholder.alias + "/claims/link"));
}
}

View File

@ -3,6 +3,7 @@ import {properties} from "../../../environments/environment";
import {ActivatedRoute} from "@angular/router";
import {StakeholderService} from "../../openaireLibrary/monitor/services/stakeholder.service";
import {Title} from "@angular/platform-browser";
import {EnvProperties} from "../../openaireLibrary/utils/properties/env-properties";
@Component({
selector: 'openaire-claims-admin',
@ -12,7 +13,7 @@ import {Title} from "@angular/platform-browser";
<ul class="uk-tab uk-margin-remove-bottom uk-margin-medium-top">
<li><a routerLink="../../users/manager">Managers</a></li>
<li ><a routerLink="../../users/member">Members</a></li>
<li class="uk-active"><a >Links</a></li>
<li *ngIf="properties.environment != 'production'" class="uk-active"><a >Links</a></li>
</ul>
</div>
<div inner>
@ -28,7 +29,8 @@ export class OpenaireClaimsAdminComponent implements OnInit {
claimsInfoURL: string;
userInfoURL: string;
subscriptions = []
fetchId = null
fetchId = null;
public properties: EnvProperties = properties;
constructor( private route: ActivatedRoute, private stakeholderService: StakeholderService, private title: Title) {
}

@ -1 +1 @@
Subproject commit 6af1bfb79e162311d9513dc83e9871d95ae35b4e
Subproject commit 6620e06ae22ab3157f3e8cf5556b959fbeb5648d

View File

@ -8,7 +8,7 @@
<ul class="uk-tab uk-margin-remove-bottom uk-margin-medium-top">
<li [class.uk-active]="tab === 'manager'"><a routerLink="../manager">Managers</a></li>
<li [class.uk-active]="tab === 'member'"><a routerLink="../member">Members</a></li>
<li ><a routerLink="../links">Links</a></li>
<li *ngIf="properties.environment != 'production'" ><a routerLink="../links">Links</a></li>
</ul>
</role-users>