diff --git a/portal-2/src/app/app.component.ts b/portal-2/src/app/app.component.ts index a6f495ea..dc666d11 100644 --- a/portal-2/src/app/app.component.ts +++ b/portal-2/src/app/app.component.ts @@ -51,16 +51,25 @@ export class XLargeDirective { - + OpenAIRE uses cookies in order to function properly.
Cookies are small pieces of data that websites store in your browser to allow us to give you the best browsing experience possible. By using the OpenAIRE portal you accept our use of cookies. Read more - + ` }) export class AppComponent { - title = 'ftw'; + isClient:boolean = false; + + ngOnInit() { + if (typeof document !== 'undefined') { + try{ + this.isClient = true; + }catch (e) { + } + } + } } diff --git a/portal-2/src/app/claims/linking/bulkClaim/bulkClaim.component.ts b/portal-2/src/app/claims/linking/bulkClaim/bulkClaim.component.ts index df0d39e1..38f25a68 100644 --- a/portal-2/src/app/claims/linking/bulkClaim/bulkClaim.component.ts +++ b/portal-2/src/app/claims/linking/bulkClaim/bulkClaim.component.ts @@ -67,7 +67,7 @@ export class BulkClaimComponent { type : string = "publication"; resultsFromSearch:number; @Input() public select:boolean = true ; - @Input() public publications; + @Input() public results; allIds:string[] = []; foundIds:string[] = []; @@ -104,11 +104,12 @@ export class BulkClaimComponent { this.allIds = []; this.foundIds = []; this.noValidIds = []; - this.publications.slice(0,this.publications.length); + this.results.slice(0,this.results.length); this.notFoundIds = []; for(i=0;i { + var crossrefResult = data.items[0]; + if(data.items.length > 0){ + this.foundIds.push(id); + var result = {id: id, type :'dataset', source : 'datacite', + title: crossrefResult.title,url: crossrefResult.URL, result: crossrefResult, accessRights: accessMode, embargoEndDate: date, date : crossrefResult.created['date-time']}; + this.results.push(result); + + + }else{ + this.notFoundIds.push(id); + } + this.endOfFetching(); + }, + err => { + console.log(err); + this.notFoundIds.push(id); + this.endOfFetching(); + } + ); + } endOfFetching(){ if(this.allIds.length == this.foundIds.length+this.notFoundIds.length+ this.duplicateIds.length ){ this.showReport = true; diff --git a/portal-2/src/app/claims/linking/selected/selectedResults.component.ts b/portal-2/src/app/claims/linking/selected/selectedResults.component.ts index 60a5f485..422eae8b 100644 --- a/portal-2/src/app/claims/linking/selected/selectedResults.component.ts +++ b/portal-2/src/app/claims/linking/selected/selectedResults.component.ts @@ -19,7 +19,7 @@ import {Dates} from '../../../utils/string-utils.class'; Search mode - +
diff --git a/portal-2/src/app/landingPages/dataProvider/dataProvider.component.ts b/portal-2/src/app/landingPages/dataProvider/dataProvider.component.ts index e5557b06..5174f4fa 100644 --- a/portal-2/src/app/landingPages/dataProvider/dataProvider.component.ts +++ b/portal-2/src/app/landingPages/dataProvider/dataProvider.component.ts @@ -44,7 +44,7 @@ export class DataProviderComponent { public reloadDatasets: boolean = true; public reloadProjects: boolean = true; public reloadDataproviders: boolean = true; -public reloadRelatedDatasources: boolean = true; + public reloadRelatedDatasources: boolean = true; public metricsClicked: boolean; private viewsFrameUrl: string; private downloadsFrameUrl: string; diff --git a/portal-2/src/app/searchPages/searchUtils/searchPage.component.ts b/portal-2/src/app/searchPages/searchUtils/searchPage.component.ts index d9ed93fe..bf7353f9 100644 --- a/portal-2/src/app/searchPages/searchUtils/searchPage.component.ts +++ b/portal-2/src/app/searchPages/searchUtils/searchPage.component.ts @@ -1,4 +1,4 @@ -import {Component, Input, ViewChild, Output, EventEmitter} from '@angular/core'; +import {Component, Input, ViewChild, Output, EventEmitter,ElementRef} from '@angular/core'; import {Observable} from 'rxjs/Observable'; import {Location} from '@angular/common'; import { Filter, Value} from './searchHelperClasses.class'; @@ -141,10 +141,13 @@ export class SearchPageComponent { @ViewChild (SearchFilterModalComponent) searchFilterModal : SearchFilterModalComponent ; public currentFilter: Filter; - constructor (private location: Location , private _meta: Meta) { + constructor (private location: Location , private _meta: Meta,private element: ElementRef) { } ngOnInit() { + if (typeof document !== 'undefined') { + this.element.nativeElement.scrollIntoView(); + } this.updateBaseUrlWithParameters(this.filters); this.defineUrlParam(); this.updateTitle(this.pageTitle); @@ -497,7 +500,9 @@ export class SearchPageComponent { index:indexQuery }); - + if (typeof document !== 'undefined') { + this.element.nativeElement.scrollIntoView(); + } } filterChanged($event){ console.info("filter Changed"); diff --git a/portal-2/src/app/sharedComponents/navigationBar.component.ts b/portal-2/src/app/sharedComponents/navigationBar.component.ts index 520770bc..39cffa18 100644 --- a/portal-2/src/app/sharedComponents/navigationBar.component.ts +++ b/portal-2/src/app/sharedComponents/navigationBar.component.ts @@ -30,39 +30,39 @@ import {Session} from '../login/utils/helper.class';
-
+
-
    +
    • -
      +
        @@ -142,7 +142,7 @@ import {Session} from '../login/utils/helper.class';
      • -
        +
          @@ -155,7 +155,7 @@ import {Session} from '../login/utils/helper.class';
        • -
          +
            @@ -168,7 +168,7 @@ import {Session} from '../login/utils/helper.class';
          • -
            +
              @@ -188,8 +188,8 @@ import {Session} from '../login/utils/helper.class';
            - - +
            @@ -208,10 +208,18 @@ import {Session} from '../login/utils/helper.class'; export class NavigationBarComponent { public isAuthorized: boolean = false; sub:any; + isClient:boolean = false; + + constructor( private router: Router, private route: ActivatedRoute) {} ngOnInit() { - + if (typeof document !== 'undefined') { + try{ + this.isClient = true; + }catch (e) { + } + } this.initialize(); this.sub = this.route.queryParams.subscribe(params => { this.initialize(); @@ -228,5 +236,9 @@ export class NavigationBarComponent { } } + onClick(id: string) { + var el: HTMLElement = document.getElementById(id); + el.classList.remove('uk-open'); + } } diff --git a/portal-2/src/app/utils/properties/openaireProperties.ts b/portal-2/src/app/utils/properties/openaireProperties.ts index b5ac6f0e..70f54b6d 100644 --- a/portal-2/src/app/utils/properties/openaireProperties.ts +++ b/portal-2/src/app/utils/properties/openaireProperties.ts @@ -37,20 +37,24 @@ export class OpenaireProperties { private static framesAPIURL = "https://beta.openaire.eu/stats3/"; private static loginAPIURL = "http://scoobydoo.di.uoa.gr:8080/uoa-user-management-1.0.0-SNAPSHOT/api/users/authenticates"; - private static loginAPIURL_pm = "https://scoobydoo.di.uoa.gr:8080/uoa-user-management-1.0.0-SNAPSHOT/api/users/authenticates"; + private static loginAPIURL_pm = "https://beta.services.openaire.eu/uoa-user-management/api/users/authenticates"; private static claimsAPIURL = "http://scoobydoo.di.uoa.gr:8080/dnet-openaire-connector-service-2.0.0-SNAPSHOT/rest/claimsService/"; private static claimsAPIURL_pm = "https://beta.services.openaire.eu/claims/rest/claimsService/"; private static searchAPIURLLAst_pm = "https://beta.services.openaire.eu/search/v2/api/"; - private static searchAPIURLLAst = "http://scoobydoo.di.uoa.gr:8080/dnet-functionality-services-2.0.0-SNAPSHOT/rest/v2/api/"; + private static searchAPIURLLAst = "https://beta.services.openaire.eu/search/v2/api/"; +// private static searchAPIURLLAst = "http://scoobydoo.di.uoa.gr:8080/dnet-functionality-services-2.0.0-SNAPSHOT/rest/v2/api/"; private static searchResourcesAPIURL_pm = "https://beta.services.openaire.eu/search/v2/api/resources"; - private static searchResourcesAPIURL = "http://scoobydoo.di.uoa.gr:8080/dnet-functionality-services-2.0.0-SNAPSHOT/rest/v2/api/resources"; + private static searchResourcesAPIURL = "https://beta.services.openaire.eu/search/v2/api/resources"; + // private static searchResourcesAPIURL = "http://scoobydoo.di.uoa.gr:8080/dnet-functionality-services-2.0.0-SNAPSHOT/rest/v2/api/resources"; private static csvAPIURL_pm = "https://beta.services.openaire.eu/search/v2/api/";//publications?format=csv - private static csvAPIURL = "http://scoobydoo.di.uoa.gr:8080/dnet-functionality-services-2.0.0-SNAPSHOT/rest/v2/api/";//publications?format=csv + private static csvAPIURL = "https://beta.services.openaire.eu/search/v2/api/";//publications?format=csv + +// private static csvAPIURL = "http://scoobydoo.di.uoa.gr:8080/dnet-functionality-services-2.0.0-SNAPSHOT/rest/v2/api/";//publications?format=csv private static searchCrossrefAPIURL = "https://api.crossref.org/works"; // private static searchDataciteAPIURL = "https://search.datacite.org/api"; diff --git a/portal-2/src/assets/custom.css b/portal-2/src/assets/custom.css index 63db0b18..4b6beee8 100644 --- a/portal-2/src/assets/custom.css +++ b/portal-2/src/assets/custom.css @@ -33,10 +33,9 @@ .custom-user-mini-panel a{ color:rgb(36, 91, 204); } -/*.custom-main-content{ - height: 100%; - min-height: 750px; -}*/ +.custom-main-content{ + min-height: 550px; +} .custom-autocomplete .uk-nav-autocomplete > li > a:hover { background: #00a8e6 none repeat scroll 0 0; @@ -143,3 +142,8 @@ overflow-y: auto; overflow-x: hidden; max-height:265px; } +.custom-offcanvas-close { + position: relative; + right: 0; + top: 0; +} diff --git a/portal-2/src/index.html b/portal-2/src/index.html index 86d19ec3..8bdf40e3 100644 --- a/portal-2/src/index.html +++ b/portal-2/src/index.html @@ -1,4 +1,4 @@ - + @@ -29,9 +29,11 @@ - - - + + + + + @@ -69,12 +71,14 @@ - +
            + + Loading Universal ...