From 5ad74bceeee297f49c1d70b884a0320ad3e12d1e Mon Sep 17 00:00:00 2001 From: "konstantina.galouni" Date: Fri, 25 Aug 2023 12:02:46 +0300 Subject: [PATCH 1/5] WIP: Right-help column in validation options page --- .../oaipmh-validator.component.html | 63 ++++++++++++++++++- .../oaipmh-validator.component.less | 25 ++++++++ .../oaipmh-validator.component.ts | 13 ++++ 3 files changed, 99 insertions(+), 2 deletions(-) diff --git a/src/app/pages/oaipmh-validator/validation-settings/oaipmh-validator.component.html b/src/app/pages/oaipmh-validator/validation-settings/oaipmh-validator.component.html index e5abb80..0f48f9f 100644 --- a/src/app/pages/oaipmh-validator/validation-settings/oaipmh-validator.component.html +++ b/src/app/pages/oaipmh-validator/validation-settings/oaipmh-validator.component.html @@ -1,7 +1,9 @@
-
-
+
+ + +
1. Select a data source (repository or journal)
@@ -50,9 +52,66 @@ Start Validation
+ +
aaaaaaaaaaaaaaaaaaaaaaaa oooooooooooooooooooo iiiiiiiiiiiiiiiiiiii
+
aaaaaaaaaaaaaaaaaaaaaaaa oooooooooooooooooooo iiiiiiiiiiiiiiiiiiii
+
aaaaaaaaaaaaaaaaaaaaaaaa oooooooooooooooooooo iiiiiiiiiiiiiiiiiiii
+
aaaaaaaaaaaaaaaaaaaaaaaa oooooooooooooooooooo iiiiiiiiiiiiiiiiiiii
+
aaaaaaaaaaaaaaaaaaaaaaaa oooooooooooooooooooo iiiiiiiiiiiiiiiiiiii
+
aaaaaaaaaaaaaaaaaaaaaaaa oooooooooooooooooooo iiiiiiiiiiiiiiiiiiii
+
aaaaaaaaaaaaaaaaaaaaaaaa oooooooooooooooooooo iiiiiiiiiiiiiiiiiiii
+
aaaaaaaaaaaaaaaaaaaaaaaa oooooooooooooooooooo iiiiiiiiiiiiiiiiiiii
+
aaaaaaaaaaaaaaaaaaaaaaaa oooooooooooooooooooo iiiiiiiiiiiiiiiiiiii
+
aaaaaaaaaaaaaaaaaaaaaaaa oooooooooooooooooooo iiiiiiiiiiiiiiiiiiii
+
aaaaaaaaaaaaaaaaaaaaaaaa oooooooooooooooooooo iiiiiiiiiiiiiiiiiiii
+
aaaaaaaaaaaaaaaaaaaaaaaa oooooooooooooooooooo iiiiiiiiiiiiiiiiiiii
+
aaaaaaaaaaaaaaaaaaaaaaaa oooooooooooooooooooo iiiiiiiiiiiiiiiiiiii
+
aaaaaaaaaaaaaaaaaaaaaaaa oooooooooooooooooooo iiiiiiiiiiiiiiiiiiii
+
aaaaaaaaaaaaaaaaaaaaaaaa oooooooooooooooooooo iiiiiiiiiiiiiiiiiiii
+
aaaaaaaaaaaaaaaaaaaaaaaa oooooooooooooooooooo iiiiiiiiiiiiiiiiiiii
+
aaaaaaaaaaaaaaaaaaaaaaaa oooooooooooooooooooo iiiiiiiiiiiiiiiiiiii
+
aaaaaaaaaaaaaaaaaaaaaaaa oooooooooooooooooooo iiiiiiiiiiiiiiiiiiii
+
aaaaaaaaaaaaaaaaaaaaaaaa oooooooooooooooooooo iiiiiiiiiiiiiiiiiiii
+
aaaaaaaaaaaaaaaaaaaaaaaa oooooooooooooooooooo iiiiiiiiiiiiiiiiiiii
+
aaaaaaaaaaaaaaaaaaaaaaaa oooooooooooooooooooo iiiiiiiiiiiiiiiiiiii
+
aaaaaaaaaaaaaaaaaaaaaaaa oooooooooooooooooooo iiiiiiiiiiiiiiiiiiii
+
aaaaaaaaaaaaaaaaaaaaaaaa oooooooooooooooooooo iiiiiiiiiiiiiiiiiiii
+
aaaaaaaaaaaaaaaaaaaaaaaa oooooooooooooooooooo iiiiiiiiiiiiiiiiiiii
+
aaaaaaaaaaaaaaaaaaaaaaaa oooooooooooooooooooo iiiiiiiiiiiiiiiiiiii
+
aaaaaaaaaaaaaaaaaaaaaaaa oooooooooooooooooooo iiiiiiiiiiiiiiiiiiii
+ + + + + + + + + + + + + +
+
+
+ test +
+
+
+
+ +
+ +
+
diff --git a/src/app/pages/oaipmh-validator/validation-settings/oaipmh-validator.component.less b/src/app/pages/oaipmh-validator/validation-settings/oaipmh-validator.component.less index e69de29..f9cd71f 100644 --- a/src/app/pages/oaipmh-validator/validation-settings/oaipmh-validator.component.less +++ b/src/app/pages/oaipmh-validator/validation-settings/oaipmh-validator.component.less @@ -0,0 +1,25 @@ +@import (reference) "~src/assets/openaire-theme/less/_import-variables"; + +@header-height: @global-header-height; +@sidebar-height: calc(100vh - @header-height); + +#center-content { + min-height: @sidebar-height; +} + +#right-sidebar { + & > .uk-sticky { + height: @sidebar-height; + } + + //& > .uk-card { + // height: @sidebar-height - + //} +} + +.quick-contact { + position: sticky; + bottom: 5vh; + //right: 5vw; + z-index: @global-z-index - 20; +} diff --git a/src/app/pages/oaipmh-validator/validation-settings/oaipmh-validator.component.ts b/src/app/pages/oaipmh-validator/validation-settings/oaipmh-validator.component.ts index e63724b..430213f 100644 --- a/src/app/pages/oaipmh-validator/validation-settings/oaipmh-validator.component.ts +++ b/src/app/pages/oaipmh-validator/validation-settings/oaipmh-validator.component.ts @@ -24,6 +24,9 @@ export class OaipmhValidatorComponent implements OnInit { public recordsNum: number = 10; public loadingSets: boolean = false; + public offset: number = 0; + public help: boolean = false; + subscriptions = []; constructor(private fb: UntypedFormBuilder, private router: Router, private validator: OaipmhValidatorService) { @@ -37,6 +40,16 @@ export class OaipmhValidatorComponent implements OnInit { ngOnInit() {} + ngAfterViewInit() { + if (typeof document !== 'undefined') { + if(document.getElementById("main-menu")) { + this.offset = Number.parseInt(getComputedStyle(document.documentElement).getPropertyValue('--header-height')); + } else { + this.offset = 0; + } + } + } + ngOnDestroy() { this.subscriptions.forEach(subscription => { if (subscription instanceof Subscriber) { From 259a5a8af61a8d1fc8932089d79761af252059bf Mon Sep 17 00:00:00 2001 From: "konstantina.galouni" Date: Tue, 12 Sep 2023 17:07:52 +0300 Subject: [PATCH 2/5] [Validator | right-col-temp]: [WIP] oaipmh-validator.component.less: Added styling rules for right column of validation page | oaipmh-validator.component.html: Updated margins & paddings and added content to the right column of validation page. --- src/app/openaire-library | 2 +- .../oaipmh-validator.component.html | 121 ++++++++++++------ .../oaipmh-validator.component.less | 30 +++++ src/assets/common-assets | 2 +- src/assets/openaire-theme | 2 +- 5 files changed, 114 insertions(+), 43 deletions(-) diff --git a/src/app/openaire-library b/src/app/openaire-library index 40ef950..821c424 160000 --- a/src/app/openaire-library +++ b/src/app/openaire-library @@ -1 +1 @@ -Subproject commit 40ef9507150f90d9e50298adb23c29b3d5a9745b +Subproject commit 821c4242bef1fc2725d40c32fc857052b2a15ab3 diff --git a/src/app/pages/oaipmh-validator/validation-settings/oaipmh-validator.component.html b/src/app/pages/oaipmh-validator/validation-settings/oaipmh-validator.component.html index 0f48f9f..d095004 100644 --- a/src/app/pages/oaipmh-validator/validation-settings/oaipmh-validator.component.html +++ b/src/app/pages/oaipmh-validator/validation-settings/oaipmh-validator.component.html @@ -1,10 +1,10 @@
-
-
+
+
-
- +
+
1. Select a data source (repository or journal)
Start Validation
- -
aaaaaaaaaaaaaaaaaaaaaaaa oooooooooooooooooooo iiiiiiiiiiiiiiiiiiii
-
aaaaaaaaaaaaaaaaaaaaaaaa oooooooooooooooooooo iiiiiiiiiiiiiiiiiiii
-
aaaaaaaaaaaaaaaaaaaaaaaa oooooooooooooooooooo iiiiiiiiiiiiiiiiiiii
-
aaaaaaaaaaaaaaaaaaaaaaaa oooooooooooooooooooo iiiiiiiiiiiiiiiiiiii
-
aaaaaaaaaaaaaaaaaaaaaaaa oooooooooooooooooooo iiiiiiiiiiiiiiiiiiii
-
aaaaaaaaaaaaaaaaaaaaaaaa oooooooooooooooooooo iiiiiiiiiiiiiiiiiiii
-
aaaaaaaaaaaaaaaaaaaaaaaa oooooooooooooooooooo iiiiiiiiiiiiiiiiiiii
-
aaaaaaaaaaaaaaaaaaaaaaaa oooooooooooooooooooo iiiiiiiiiiiiiiiiiiii
-
aaaaaaaaaaaaaaaaaaaaaaaa oooooooooooooooooooo iiiiiiiiiiiiiiiiiiii
-
aaaaaaaaaaaaaaaaaaaaaaaa oooooooooooooooooooo iiiiiiiiiiiiiiiiiiii
-
aaaaaaaaaaaaaaaaaaaaaaaa oooooooooooooooooooo iiiiiiiiiiiiiiiiiiii
-
aaaaaaaaaaaaaaaaaaaaaaaa oooooooooooooooooooo iiiiiiiiiiiiiiiiiiii
-
aaaaaaaaaaaaaaaaaaaaaaaa oooooooooooooooooooo iiiiiiiiiiiiiiiiiiii
-
aaaaaaaaaaaaaaaaaaaaaaaa oooooooooooooooooooo iiiiiiiiiiiiiiiiiiii
-
aaaaaaaaaaaaaaaaaaaaaaaa oooooooooooooooooooo iiiiiiiiiiiiiiiiiiii
-
aaaaaaaaaaaaaaaaaaaaaaaa oooooooooooooooooooo iiiiiiiiiiiiiiiiiiii
-
aaaaaaaaaaaaaaaaaaaaaaaa oooooooooooooooooooo iiiiiiiiiiiiiiiiiiii
-
aaaaaaaaaaaaaaaaaaaaaaaa oooooooooooooooooooo iiiiiiiiiiiiiiiiiiii
-
aaaaaaaaaaaaaaaaaaaaaaaa oooooooooooooooooooo iiiiiiiiiiiiiiiiiiii
-
aaaaaaaaaaaaaaaaaaaaaaaa oooooooooooooooooooo iiiiiiiiiiiiiiiiiiii
-
aaaaaaaaaaaaaaaaaaaaaaaa oooooooooooooooooooo iiiiiiiiiiiiiiiiiiii
-
aaaaaaaaaaaaaaaaaaaaaaaa oooooooooooooooooooo iiiiiiiiiiiiiiiiiiii
-
aaaaaaaaaaaaaaaaaaaaaaaa oooooooooooooooooooo iiiiiiiiiiiiiiiiiiii
-
aaaaaaaaaaaaaaaaaaaaaaaa oooooooooooooooooooo iiiiiiiiiiiiiiiiiiii
-
aaaaaaaaaaaaaaaaaaaaaaaa oooooooooooooooooooo iiiiiiiiiiiiiiiiiiii
-
aaaaaaaaaaaaaaaaaaaaaaaa oooooooooooooooooooo iiiiiiiiiiiiiiiiiiii
- +
- - - - + + + + -
-
+
+
- test +
+
+
Help
+
+
+
    +
  • + + + + + + 1 + + + + Select Data source + +
    +

    + Select from the list, or enter the base OAI URL of the repository/ journal. + The repository's/ journal's published sets are exposed in a later stage and you may select one for the compatibility tests. +

    +
    +
    • +
  • + + + + + + 2 + + + + Select Guidelines + +
    +

    You may apply two types of compatibility tests on your repository:

    +
      +
    • Content: specific to the content/ format of the dc fields
      • +
    • Usage: specific to the implementation of OAI-PMH
      • +
    +

    You may select from a predefined set of rules (OpenAIRE for Literature Repositories, OpenAIRE for Data Archives) or customize them according to your needs.

    +
    +
    • +
  • + + + + + + 3 + + + + Select Parameters + +
    +

    + ... +

    +
    +
    • +
+
+ Dismiss Help +
-
+
@@ -156,3 +159,72 @@
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/app/pages/oaipmh-validator/validation-settings/oaipmh-validator.component.ts b/src/app/pages/oaipmh-validator/validation-settings/oaipmh-validator.component.ts index 430213f..0603ba2 100644 --- a/src/app/pages/oaipmh-validator/validation-settings/oaipmh-validator.component.ts +++ b/src/app/pages/oaipmh-validator/validation-settings/oaipmh-validator.component.ts @@ -1,4 +1,4 @@ -import {Component, OnInit} from '@angular/core'; +import {ChangeDetectorRef, Component, OnInit, ViewChild} from '@angular/core'; import {OaipmhValidatorService} from "../../../services/oaipmh-validator.service"; import {UntypedFormBuilder, UntypedFormGroup, Validators} from "@angular/forms"; import {Option} from "../../../openaire-library/sharedComponents/input/input.component"; @@ -13,6 +13,10 @@ import {Subscriber} from "rxjs"; styleUrls: ['./oaipmh-validator.component.less'] }) export class OaipmhValidatorComponent implements OnInit { + @ViewChild("right_sidebar") right_sidebar; + @ViewChild("right_sidebar_header") right_sidebar_header; + @ViewChild("right_sidebar_footer") right_sidebar_footer; + public options: Option[] = [ {label: 'OpenAIRE Guidelines for Data Archives Profile v2', value: 'OpenAIRE Guidelines for Data Archives Profile v2'}, {label: 'OpenAIRE Guidelines for Literature Repositories Profile v3', value: 'OpenAIRE Guidelines for Literature Repositories Profile v3'}, @@ -27,9 +31,13 @@ export class OaipmhValidatorComponent implements OnInit { public offset: number = 0; public help: boolean = false; + public right_sidebar_body_height: number = 0; + subscriptions = []; - constructor(private fb: UntypedFormBuilder, private router: Router, private validator: OaipmhValidatorService) { + constructor(private fb: UntypedFormBuilder, private router: Router, + private cdr: ChangeDetectorRef, + private validator: OaipmhValidatorService) { this.form = this.fb.group({ url: this.fb.control("", StringUtils.urlValidator()),//[Validators.required/*, Validators.email*/]), guidelines: this.fb.control("", Validators.required), @@ -58,6 +66,17 @@ export class OaipmhValidatorComponent implements OnInit { }); } + openHelp() { + this.help = true; + this.cdr.detectChanges(); + if (typeof document !== 'undefined') { + console.log(this.right_sidebar.nativeElement.offsetHeight); + console.log(this.right_sidebar_header.nativeElement.offsetHeight); + console.log(this.right_sidebar_footer.nativeElement.offsetHeight); + this.right_sidebar_body_height = this.right_sidebar.nativeElement.offsetHeight - this.right_sidebar_header.nativeElement.offsetHeight - this.right_sidebar_footer.nativeElement.offsetHeight; + } + } + updateRecordsNum(increase: boolean = true) { this.recordsNum = this.recordsNum + (increase ? 10 : -10); this.form.get('recordsNum').setValue(this.recordsNum); @@ -95,4 +114,6 @@ export class OaipmhValidatorComponent implements OnInit { } )); } + + protected readonly innerHeight = innerHeight; } From 36833e9879163b3a7aa3d12086325e9870694084 Mon Sep 17 00:00:00 2001 From: "konstantina.galouni" Date: Wed, 13 Sep 2023 15:42:24 +0300 Subject: [PATCH 4/5] [Validator | right-col-temp]: [WIP] oaipmh-validator.component: Updates in right sidebar of validation page. --- .../oaipmh-validator.component.html | 12 +++++++----- .../oaipmh-validator.component.less | 7 +++++++ .../oaipmh-validator.component.ts | 4 +++- 3 files changed, 17 insertions(+), 6 deletions(-) diff --git a/src/app/pages/oaipmh-validator/validation-settings/oaipmh-validator.component.html b/src/app/pages/oaipmh-validator/validation-settings/oaipmh-validator.component.html index 5633dc0..0bca244 100644 --- a/src/app/pages/oaipmh-validator/validation-settings/oaipmh-validator.component.html +++ b/src/app/pages/oaipmh-validator/validation-settings/oaipmh-validator.component.html @@ -69,13 +69,14 @@
+ class="uk-width-1-3 uk-width-1-4@l uk-padding-remove uk-text-small uk-visible@m uk-background-primary">
-
+
Help
+
    @@ -84,7 +85,7 @@ - + 1 @@ -103,7 +104,7 @@ - + 2 @@ -124,7 +125,7 @@ - + 3 @@ -141,6 +142,7 @@
Dismiss Help +
diff --git a/src/app/pages/oaipmh-validator/validation-settings/oaipmh-validator.component.less b/src/app/pages/oaipmh-validator/validation-settings/oaipmh-validator.component.less index 5f81fe3..45b4630 100644 --- a/src/app/pages/oaipmh-validator/validation-settings/oaipmh-validator.component.less +++ b/src/app/pages/oaipmh-validator/validation-settings/oaipmh-validator.component.less @@ -12,6 +12,13 @@ height: @sidebar-height; } + .uk-card { + border-top-left-radius: 25px; + border-top-right-radius: 25px; + border-bottom-right-radius: 0; + border-bottom-left-radius: 0; + } + //& > .uk-card { // height: @sidebar-height - //} diff --git a/src/app/pages/oaipmh-validator/validation-settings/oaipmh-validator.component.ts b/src/app/pages/oaipmh-validator/validation-settings/oaipmh-validator.component.ts index 0603ba2..315a8b4 100644 --- a/src/app/pages/oaipmh-validator/validation-settings/oaipmh-validator.component.ts +++ b/src/app/pages/oaipmh-validator/validation-settings/oaipmh-validator.component.ts @@ -32,6 +32,7 @@ export class OaipmhValidatorComponent implements OnInit { public help: boolean = false; public right_sidebar_body_height: number = 0; + public right_sidebar_card_height: number = 0; subscriptions = []; @@ -73,7 +74,8 @@ export class OaipmhValidatorComponent implements OnInit { console.log(this.right_sidebar.nativeElement.offsetHeight); console.log(this.right_sidebar_header.nativeElement.offsetHeight); console.log(this.right_sidebar_footer.nativeElement.offsetHeight); - this.right_sidebar_body_height = this.right_sidebar.nativeElement.offsetHeight - this.right_sidebar_header.nativeElement.offsetHeight - this.right_sidebar_footer.nativeElement.offsetHeight; + this.right_sidebar_card_height = this.right_sidebar.nativeElement.offsetHeight - this.right_sidebar_header.nativeElement.offsetHeight + 1; + this.right_sidebar_body_height = this.right_sidebar_card_height - this.right_sidebar_footer.nativeElement.offsetHeight; } } From ad94971ec14e976e315f17e40fbc4d62b3bedc3c Mon Sep 17 00:00:00 2001 From: "konstantina.galouni" Date: Wed, 13 Sep 2023 15:43:24 +0300 Subject: [PATCH 5/5] Updating libraries --- src/app/openaire-library | 2 +- src/assets/openaire-theme | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/app/openaire-library b/src/app/openaire-library index 821c424..11d0be4 160000 --- a/src/app/openaire-library +++ b/src/app/openaire-library @@ -1 +1 @@ -Subproject commit 821c4242bef1fc2725d40c32fc857052b2a15ab3 +Subproject commit 11d0be4ffd6649189f87c91aed1c2d47c5d9b2c8 diff --git a/src/assets/openaire-theme b/src/assets/openaire-theme index 5feca2d..3a4aa92 160000 --- a/src/assets/openaire-theme +++ b/src/assets/openaire-theme @@ -1 +1 @@ -Subproject commit 5feca2d8457324999557feb662b4355d8cf0df4b +Subproject commit 3a4aa92c441467994a45a2c6a4f0c21202945404