MaDgIK
/
monitor-dashboard
13
0
Fork 0
Code Issues Pull Requests Projects Releases 18 Wiki Activity

[umbrella]: Merge from develop

This commit is contained in:
Konstantinos Triantafyllou 2024-06-04 14:00:09 +03:00
parent 335cd71e4a 6e393c031d
commit bb9408efe3
6 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/app/app.component.ts
View File

@ -324,7 +324,7 @@ export class AppComponent extends SidebarBaseComponent implements OnInit {
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") {
this.adminMenuItems.push(new MenuItem("claim", "Link results", "", "/admin/" + this.stakeholder.alias + "/claims/link", false, [], [], {}, {name: 'link'}, null, "uk-visible@m", "/admin/" + this.stakeholder.alias + "/claims/link"));
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"));
}
}
this.backItem = new MenuItem("back", "Manage profiles", "", "/admin", false, [], null, {}, {name: 'west'});

4
src/app/app.module.ts
View File

@ -27,7 +27,7 @@ import {
import {LoginGuard} from "./openaireLibrary/login/loginGuard.guard";
import {IconsModule} from "./openaireLibrary/utils/icons/icons.module";
import {IconsService} from "./openaireLibrary/utils/icons/icons.service";
import {incognito} from "./openaireLibrary/utils/icons/icons";
import {incognito, link} from "./openaireLibrary/utils/icons/icons";
import {AdminDashboardGuard} from "./openaireLibrary/monitor-admin/utils/adminDashboard.guard";
import {CacheIndicatorsModule} from "./openaireLibrary/monitor-admin/utils/cache-indicators/cache-indicators.module";
import {CustomRouteReuseStrategy} from "./openaireLibrary/shared/custom-route-reuse-strategy";
@ -77,6 +77,6 @@ import {BreadcrumbsModule} from './openaireLibrary/utils/breadcrumbs/breadcrumbs
//
export class AppModule {
constructor(private iconsService: IconsService) {
this.iconsService.registerIcons([incognito])
this.iconsService.registerIcons([incognito, link])
}
}

2
src/app/claims/directLinking/directLinking.component.ts
View File

@ -26,8 +26,6 @@ export class OpenaireDirectLinkingComponent {
constructor(private route: ActivatedRoute, private stakeholderService: StakeholderService, private title: Title) {
this.claimsProperties = new MonitorClaimsProperties();
console.log(this.claimsProperties)
}
public ngOnInit() {

2
src/app/claims/monitorClaims.properties.ts
View File

@ -5,7 +5,7 @@ export class MonitorClaimsProperties extends ClaimsProperties{
super();
this.ALLOW_ORGANIZATION_LINKING = true;
this.INLINE_ENTITY.show = false;
this.INLINE_ENTITY.guideText = "Lorem ipsum";
this.INLINE_ENTITY.guideText = "";
this.BASKET.target_title = "Link to";
this.METADATA_PREVIEW.edit_target_icon = "west";
this.METADATA_PREVIEW.edit_target_title = "Go to search for results"

2
src/app/openaireLibrary

@ -1 +1 @@
Subproject commit ab09c0c7d38db47c3b04cd581419d162c9f115f3
Subproject commit 472eeef32675ff6bffafb2591abd96f49438f85d

2
src/assets/common-assets

@ -1 +1 @@
Subproject commit e48bf941bcdc567a3d09826b5686e70d43fafd46
Subproject commit c5ba8700be5b8fcf98522fe167246281545d7985