Merge remote-tracking branch 'origin/develop'

explore/CHANGELOG.md

@@ -0,0 +1,115 @@
+# Changelog
+
+All notable changes to this project will be documented in this file.
+
+The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
+and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).
+
+*For each release, use the following sub-sections:*
+
+- *Added (for new features)*
+- *Changed (for changes in existing functionality)*
+- *Deprecated (for soon-to-be removed features)*
+- *Removed (for now removed features)*
+- *Fixed (for any bug fixes)*
+- *Security (in case of vulnerabilities)*
+
+## [production-release-november-2023-v2] - 2023/11/28
+### Added
+* Add sorting options with impact factors in search results page
+
+### Changed
+* Data source landing: get collected full texts from new stats API
+* Updated parsing of measures - in results: views/downloads per data source
+
+### Fixed
+* Updated query for funders number in Funders page
+* Updated query for funders number is first page 
+* Advanced Search Results: funder field to return all funders 
+* Advanced Search Projects: funder field to return all funders
+
+## [production-release-november-2023] - 2023/11/09
+### Added
+* Missing funders' logos locally in Explore assets
+
+### Changed
+* Deposit search page: UI improvement in “Go to repository” button
+
+### Fixed
+* Reverted version of UIkit back to version 3.16.24 - previous version caused bug with dropdowns
+
+## [production-release-october-2023] - 2023/10/18
+### Added
+* Search page: Add view more option on overflow (e.g authors, partners, subjects, projects)
+
+### Changed
+* Upgrade to Angular 16
+* New Claims API
+* New Funders Page
+
+### Fixed
+* Reverted version of UIkit to version 3.16.14 because of parallax
+* A persistent identifier can resolve in more than one pid types
+
+## [production-release-september-2023] - 2023/09/25
+### FIXED
+* Error on grant access in ORCID Search & Link Wizard 
+* Added missing id in linking from the project landing
+* Added check in search data sources parsing
+
+## [production-release-august-2023] - 2023/08/25
+### Added
+* Search mobile: Added actions
+* Detailed pages - mobile: Added search-bar
+* Mobile: new drops and dropdowns
+
+### Changed
+* Linking: Redesign of results view
+* Advanced search form: Add autocomplete input for eosc subject field
+* Detailed pages - mobile: UI updates & improvements
+
+### Fixed
+* Advanced search and detailed page
+* Added a necessary check in html of detailed pages
+
+## [production-release-may-2023] - 2023/05/19
+### Added
+* Detailed research products page: Added suggest modals for Sustainable Development Goals and Fields of Science
+* Get research products, projects & data sources usage counts from index
+
+### Changed
+* Redesign of detailed pages and mobile version
+
+### Fixed
+* Fix path for fos/sdg vocabularies in advanced search
+* Search page improvements
+* UI updates & improvements in search results and detailed pages (minor)
+
+## [production-release-january-2023] - 2023/01/18
+### FIXED
+* Contact us form: Email body was either empty or incomplete
+* Contact us page: After sending an email, clear recaptcha
+
+
+## [production-release-december-2022] - 2022/12/21
+### Added
+* Link to blog in Sustainable Development Goals page
+
+### Changed
+* SEO updates and mobile menu
+
+### Fixed
+* Linking: Changed Crossref requests for bulk uploaded DOIs
+* Medium screens: not sticky navbar causing error
+
+## [production-release-november-2022] - 2022/11/30
+### Added
+* EOSC subjects from eoscifguidelines field & Advanced field "EOSC Subject"
+* New Contact us page
+
+### Changed
+* Upgrade to Angular 14
+* Refinement of filters
+* Advanced search form: UI updates and smooth scrolling
+* FoS and deposit pages updates
+* Bip Finder: Updated parsing and labels for Bip Finder scores & updated link to BiP Finder

explore/routes.ts

@@ -13,6 +13,8 @@ export const routes = [
    '/participate/deposit-subject-result',
    '/participate/deposit-publications',
    '/participate/deposit-publications-result',
+   '/participate/deposit/learn-how',
+   '/participate/deposit/search',
    '/search/find/research-outcomes',
    '/search/find',
    '/search/find/publications',
@@ -40,4 +42,9 @@ export const routes = [
    '/claims',
    '/participate/claim',
    '/participate/direct-claim',
+  '/my-orcid-links',
+  '/sdgs',
+  '/fields-of-science',
+  '/funders',
+  '/contact-us',
 ];

explore/src/app/app-routing.module.ts

@@ -7,7 +7,6 @@ const routes: Routes = [
   // Other Pages
   {path: '', loadChildren: () => import('./home/home.module').then(m => m.HomeModule), data: {hasStickyHeaderOnMobile: true}},
   {path: 'home', redirectTo: '', pathMatch: 'full'},
-  {path: 'mail-preferences', loadChildren: () => import('./userEmailPreferences/mailPrefs.module').then(m => m.LibMailPrefsModule)},
 	{path: 'sdgs', loadChildren: () => import('./sdg/sdg.module').then(m => m.LibSdgModule)},
 	{path: 'fields-of-science', loadChildren: () => import('./fos/fos.module').then(m => m.LibFosModule), data: {extraOffset: 100}},
   {path: 'funders', loadChildren: () => import('./funders/funders.module').then(m => m.FundersModule)},
@@ -32,10 +31,6 @@ const routes: Routes = [
     loadChildren: () => import('./landingPages/organization/libOrganization.module').then(m => m.LibOrganizationModule),
 		data: {hasQuickContact: false, hasMenuSearchBar: true}
   },
-  {
-    path: 'project-report',
-    loadChildren: () => import('./landingPages/htmlProjectReport/libHtmlProjectReport.module').then(m => m.LibHtmlProjectReportModule)
-  },
 
   // Search Pages
   {

explore/src/app/funders/funders.component.ts

@@ -220,7 +220,9 @@ export class FundersComponent implements OnInit {
             value.openAccessPercentage = Math.round((value.openAccessResearchProducts / value.researchProducts) * 100);
           }
           if(!value.logoUrl && this.staticLogos.has(value.id)) {
-            value.logoUrl = "assets/explore-assets/funders/logos/"+value.id+".png";
+            let split = value.id.split("||");
+            let shortname = (split && split.length==3) ? value.id.split("||")[2] : value.id;
+            value.logoUrl = "assets/explore-assets/funders/logos/"+shortname+".png";
           }
         });
         // convert funders map into an array

explore/src/app/landingPages/htmlProjectReport/htmlProjectReport-routing.module.ts

@@ -1,12 +0,0 @@
-import { NgModule } from '@angular/core';
-import { RouterModule } from '@angular/router';
-import { OpenaireHtmlProjectReportComponent } from './htmlProjectReport.component';
-import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard';
-@NgModule({
- imports: [
-  RouterModule.forChild([
-    { path: '', component: OpenaireHtmlProjectReportComponent ,canDeactivate: [PreviousRouteRecorder]}
-  ])
-]
-})
-export class HtmlProjectReportRoutingModule { }

explore/src/app/landingPages/htmlProjectReport/htmlProjectReport.component.ts

@@ -1,17 +0,0 @@
-import {Component} from '@angular/core';
-
-@Component({
-    selector: 'openaire-htmlProjectReport',
-    template: `<htmlProjectReport></htmlProjectReport>`,
- })
-export class OpenaireHtmlProjectReportComponent{
-  constructor (  ) {
-
-  }
-
-  ngOnInit() {
-}
-
-
-
-}

explore/src/app/landingPages/htmlProjectReport/libHtmlProjectReport.module.ts

@@ -1,13 +0,0 @@
-import { NgModule}            from '@angular/core';
-import { HtmlProjectReportModule  } from '../../openaireLibrary/landingPages/htmlProjectReport/htmlProjectReport.module';
-import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard';
-import { OpenaireHtmlProjectReportComponent } from './htmlProjectReport.component';
-import {HtmlProjectReportRoutingModule} from './htmlProjectReport-routing.module';
-
-@NgModule({
-  imports: [HtmlProjectReportModule, HtmlProjectReportRoutingModule],
-  declarations:[OpenaireHtmlProjectReportComponent],
-  providers:[ PreviousRouteRecorder],
-  exports:[OpenaireHtmlProjectReportComponent]
-})
-export class LibHtmlProjectReportModule { }

explore/src/app/userEmailPreferences/mailPrefs-routing.module.ts

@@ -1,18 +0,0 @@
-import { NgModule } from '@angular/core';
-import { RouterModule } from '@angular/router';
-
-import {OpenaireMailPrefsComponent } from './mailPrefs.component';
-import {LoginGuard} from '../openaireLibrary/login/loginGuard.guard';
-import {PreviousRouteRecorder} from '../openaireLibrary/utils/piwik/previousRouteRecorder.guard';
-import {IsRouteEnabled} from '../openaireLibrary/error/isRouteEnabled.guard';
-import {properties} from "../../environments/environment";
-
-
-@NgModule({
-  imports: [
-    RouterModule.forChild([
-      { path: '', component: OpenaireMailPrefsComponent, canActivate: [IsRouteEnabled, LoginGuard],
-      data: {redirect: properties.errorLink,  community : 'openaire'}, canDeactivate: [PreviousRouteRecorder]}])
-  ]
-})
-export class MailPrefsRoutingModule { }

explore/src/app/userEmailPreferences/mailPrefs.component.ts

@@ -1,25 +0,0 @@
-import {Component} from '@angular/core';
-
-
-@Component({
-    selector: 'openaire-mailPrefs',
-    template: `
-      <div id="tm-main" class=" uk-section  uk-margin-small-top tm-middle">
-        <div uk-grid uk-grid>
-          <div class="tm-main uk-width-1-1@s uk-width-1-1@m  uk-width-1-1@l uk-row-first">
-            <mailPrefs [showSaveResetButtons]="true"></mailPrefs>
-          </div>
-        </div>
-      </div>
-`
-
-})
- export class OpenaireMailPrefsComponent {
-  constructor () {
-
-   }
-   ngOnInit() {
-
-  }
-
-}

explore/src/app/userEmailPreferences/mailPrefs.module.ts

@@ -1,22 +0,0 @@
-import { NgModule } from '@angular/core';
-
-import { SharedModule } from '../openaireLibrary/shared/shared.module';
-import { OpenaireMailPrefsComponent } from './mailPrefs.component';
-import { MailPrefsRoutingModule } from './mailPrefs-routing.module';
-import { MailPrefsModule } from '../openaireLibrary/connect/userEmailPreferences/mailsPrefs.module';
-import { LoginGuard } from '../openaireLibrary/login/loginGuard.guard';
-import { PreviousRouteRecorder } from '../openaireLibrary/utils/piwik/previousRouteRecorder.guard';
-import { IsRouteEnabled } from '../openaireLibrary/error/isRouteEnabled.guard';
-
-@NgModule({
-  imports: [
-    SharedModule,
-    MailPrefsRoutingModule,
-    MailPrefsModule
-  ],
-  providers:[LoginGuard, PreviousRouteRecorder, IsRouteEnabled],
-  declarations: [
-    OpenaireMailPrefsComponent
-  ]
-})
-export class LibMailPrefsModule { }