From 6920159b100d469beab4387abf901ba1d5582d0e Mon Sep 17 00:00:00 2001 From: "k.triantafyllou" Date: Mon, 17 Jul 2023 12:41:32 +0300 Subject: [PATCH 1/8] Fix intersaction Observer in app, communities and learn-how. --- src/app/app.component.ts | 3 +-- src/app/communities/communities.component.ts | 5 +++-- src/app/learn-how/learn-how.component.ts | 4 +++- src/app/openaireLibrary | 2 +- 4 files changed, 8 insertions(+), 6 deletions(-) diff --git a/src/app/app.component.ts b/src/app/app.component.ts index 2d1bb0b..ef485d0 100644 --- a/src/app/app.component.ts +++ b/src/app/app.component.ts @@ -524,8 +524,7 @@ export class AppComponent implements OnInit, OnDestroy { restrictedData ? "" : "/myCommunities", false, [], [], {})); } this.showMenu = true; - // if (typeof document !== "undefined" && this.bottom) { - if (typeof document !== "undefined" && properties && this.isClient && this.showMenu) { + if (typeof IntersectionObserver !== "undefined") { setTimeout(() => { this.createObservers(); }); diff --git a/src/app/communities/communities.component.ts b/src/app/communities/communities.component.ts index ad7b2ed..6ecac7a 100644 --- a/src/app/communities/communities.component.ts +++ b/src/app/communities/communities.component.ts @@ -92,7 +92,8 @@ export class CommunitiesComponent implements OnInit, OnDestroy, AfterViewInit { this.subscriptions.forEach(subscription => { if (subscription instanceof Subscriber) { subscription.unsubscribe(); - } else if (subscription instanceof IntersectionObserver || subscription instanceof MutationObserver) { + } else if ((typeof MutationObserver != 'undefined' && subscription instanceof MutationObserver) || + (typeof IntersectionObserver != 'undefined' && subscription instanceof IntersectionObserver)) { subscription.disconnect(); } }); @@ -100,7 +101,7 @@ export class CommunitiesComponent implements OnInit, OnDestroy, AfterViewInit { } ngAfterViewInit() { - if(typeof window !== "undefined") { + if(typeof IntersectionObserver !== "undefined" && typeof MutationObserver !== "undefined") { this.createObservers(); } } diff --git a/src/app/learn-how/learn-how.component.ts b/src/app/learn-how/learn-how.component.ts index 906f7fb..89a2e1f 100644 --- a/src/app/learn-how/learn-how.component.ts +++ b/src/app/learn-how/learn-how.component.ts @@ -279,12 +279,14 @@ export class LearnHowComponent implements OnInit { this.subscriptions.forEach(subscription => { if (subscription instanceof Subscriber) { subscription.unsubscribe(); + } else if(typeof IntersectionObserver !== 'undefined' && subscription instanceof IntersectionObserver) { + subscription.disconnect(); } }); } ngAfterViewInit() { - if (typeof window !== "undefined") { + if (typeof IntersectionObserver !== "undefined") { this.createObservers(); } } diff --git a/src/app/openaireLibrary b/src/app/openaireLibrary index 2f98910..4700cc8 160000 --- a/src/app/openaireLibrary +++ b/src/app/openaireLibrary @@ -1 +1 @@ -Subproject commit 2f989107123ae674aba4907b113e4498a8f87786 +Subproject commit 4700cc82c866ed86158234f706fc52360bc34637 From e0ecdb2a2b5d105b5f655e93c640827287503c9b Mon Sep 17 00:00:00 2001 From: argirok Date: Tue, 18 Jul 2023 12:14:14 +0300 Subject: [PATCH 2/8] develop: section for dumps - update according to mocks --- src/app/develop/develop.component.ts | 67 ++++++++++++++-------------- 1 file changed, 34 insertions(+), 33 deletions(-) diff --git a/src/app/develop/develop.component.ts b/src/app/develop/develop.component.ts index a93ad17..7250355 100644 --- a/src/app/develop/develop.component.ts +++ b/src/app/develop/develop.component.ts @@ -75,43 +75,44 @@ import {EnvProperties} from "../openaireLibrary/utils/properties/env-properties" -
+

Download records.

-
-
-
-
-
- -
-
-
-
- To get all metadata records of the community in bulk, use the dump of research communities on Zenodo. - It contains one tar file per community. - Each tar file contains gzipped tar files with one JSON per line. - - More information -
-
- - - Community dump - - -
- - - Schema - - -
+
+
+ To get all metadata records of the community in bulk, use the dump of research communities on Zenodo. + It contains one tar file per community. + Each tar file contains gzipped tar files with one JSON per line. +
+ + Learn more
-
+ +
+
+
+ + + Community dump + + + +
+
+ + + + Schema + + +
+
+ +
+
` }) export class DevelopComponent implements OnInit, OnDestroy { From 216cf172bdbb04eb7e2a420f6e6a9399e2e98726 Mon Sep 17 00:00:00 2001 From: "konstantina.galouni" Date: Mon, 24 Jul 2023 19:19:26 +0300 Subject: [PATCH 3/8] [Connect | develop]: In search bars, set in placeholder the portal name according to the configuration name | Removed stepper from search bars in community home page, search projects and search datasources pages. 1. community.component: Get portalName by config.portalAsObservable>name and set placeholder to "Search "+portalName | Replaced input directive with search-input to remove stepper from search bar in community home page. 2. searchDataproviders.component.ts & searchProjects.component.ts: In set [entitiesSelection]="false" to remove stepper from search bar in search projects and search datasources pages. --- src/app/community/community.component.html | 37 +++++++++++----- src/app/community/community.module.ts | 3 +- src/app/openaireLibrary | 2 +- .../simple/searchDataproviders.component.ts | 8 ++-- .../simple/searchProjects.component.ts | 44 +++++++++---------- src/assets/common-assets | 2 +- src/assets/openaire-theme | 2 +- 7 files changed, 56 insertions(+), 42 deletions(-) diff --git a/src/app/community/community.component.html b/src/app/community/community.component.html index bc043a7..3483acb 100644 --- a/src/app/community/community.component.html +++ b/src/app/community/community.component.html @@ -156,21 +156,34 @@

{{community.shortTitle}}

-
+
{{community.title}}
-
- - -
- -
-
- -
+ + + + + + + + + + + + + + +
+
+ + Advanced search +
+
diff --git a/src/app/community/community.module.ts b/src/app/community/community.module.ts index 3e7e4b8..6762dff 100644 --- a/src/app/community/community.module.ts +++ b/src/app/community/community.module.ts @@ -34,6 +34,7 @@ import {InputModule} from '../openaireLibrary/sharedComponents/input/input.modul import {QuickSelectionsModule} from '../openaireLibrary/searchPages/searchUtils/quick-selections.module'; import {IconsModule} from '../openaireLibrary/utils/icons/icons.module'; import {NoLoadPaging} from '../openaireLibrary/searchPages/searchUtils/no-load-paging.module'; +import {SearchInputModule} from "../openaireLibrary/sharedComponents/search-input/search-input.module"; @NgModule({ imports: [ @@ -43,7 +44,7 @@ import {NoLoadPaging} from '../openaireLibrary/searchPages/searchUtils/no-load-p SearchResearchResultsServiceModule, SearchResultsModule, CuratorsModule, AffiliationsModule, SEOServiceModule, MatSelectModule, EntitiesSelectionModule, TabsModule, SearchTabModule, ErrorMessagesModule, SafeHtmlPipeModule, ErrorModule, - AdvancedSearchInputModule, InputModule, QuickSelectionsModule, IconsModule, NoLoadPaging + AdvancedSearchInputModule, InputModule, QuickSelectionsModule, IconsModule, NoLoadPaging, SearchInputModule ], declarations: [ CommunityComponent diff --git a/src/app/openaireLibrary b/src/app/openaireLibrary index 4700cc8..901855d 160000 --- a/src/app/openaireLibrary +++ b/src/app/openaireLibrary @@ -1 +1 @@ -Subproject commit 4700cc82c866ed86158234f706fc52360bc34637 +Subproject commit 901855daa9cddefad13a94acc9edb09f2500dc96 diff --git a/src/app/searchPages/simple/searchDataproviders.component.ts b/src/app/searchPages/simple/searchDataproviders.component.ts index 534bebe..7f49746 100644 --- a/src/app/searchPages/simple/searchDataproviders.component.ts +++ b/src/app/searchPages/simple/searchDataproviders.component.ts @@ -21,15 +21,15 @@ import {SearchResult} from "../../openaireLibrary/utils/entities/searchResult"; selector: 'openaire-search-dataproviders', template: ` - - + [simpleSearchLink]="properties.searchLinkToProjects" + [disableForms]="disableForms" + [disableRefineForms]="disableRefineForms" + [loadPaging]="loadPaging" + [oldTotalResults]="oldTotalResults" + [openaireLink]="'https://' + (properties.environment == 'production'?'':'beta.') + 'explore.openaire.eu/search/find/projects'" + [includeOnlyResultsAndFilter]="false" + [hasPrefix]="false" + searchFormClass="datasourcesTableSearchForm" [entitiesSelection]="false" [showSwitchSearchLink]="false" + [filters]="filters" + [simpleView]="true" formPlaceholderText="Search by name..." + [showResultCount]="false" [showIndexInfo]="false" [showDownload]="false" + [sort]="false" [showBreadcrumb]="true" + [customFilter]=customFilter [searchForm]="{dark: false, class: 'search-form'}"> + ` }) diff --git a/src/assets/common-assets b/src/assets/common-assets index 39cb4e5..2fd5784 160000 --- a/src/assets/common-assets +++ b/src/assets/common-assets @@ -1 +1 @@ -Subproject commit 39cb4e56d0320975fbd08fb5e9c68b87b0c82a10 +Subproject commit 2fd57843f85125e54adfb95b35776755037ea359 diff --git a/src/assets/openaire-theme b/src/assets/openaire-theme index 1e06310..cf3dab8 160000 --- a/src/assets/openaire-theme +++ b/src/assets/openaire-theme @@ -1 +1 @@ -Subproject commit 1e06310b8b2b56f131754eaded615b6cf32c5848 +Subproject commit cf3dab89f7356b88abfe6f125930076466e8a780 From 6e37f65d5d3e347728d7d7ae33e29783c3d6bd79 Mon Sep 17 00:00:00 2001 From: argirok Date: Fri, 28 Jul 2023 11:30:42 +0300 Subject: [PATCH 4/8] comment text about statistics --- src/app/communities/communities.component.html | 4 ++-- src/app/learn-how/learn-how.component.ts | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/app/communities/communities.component.html b/src/app/communities/communities.component.html index ac80962..4a04861 100644 --- a/src/app/communities/communities.component.html +++ b/src/app/communities/communities.component.html @@ -227,10 +227,10 @@ Access control -
  • +
  • Look & feel to match your brand diff --git a/src/app/learn-how/learn-how.component.ts b/src/app/learn-how/learn-how.component.ts index 89a2e1f..124cf60 100644 --- a/src/app/learn-how/learn-how.component.ts +++ b/src/app/learn-how/learn-how.component.ts @@ -184,10 +184,10 @@ import {QuickContactService} from '../openaireLibrary/sharedComponents/quick-con
    Content
    Manage projects, content providers, subjects and zenodo communities that are related to the research community.
    • -
    +
    From 6e74a775ceb7e1c70f2db387f5ca653b7debb186 Mon Sep 17 00:00:00 2001 From: "k.triantafyllou" Date: Fri, 4 Aug 2023 13:29:26 +0300 Subject: [PATCH 5/8] Update libraries --- src/app/openaireLibrary | 2 +- src/assets/openaire-theme | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/app/openaireLibrary b/src/app/openaireLibrary index 901855d..a53c4e9 160000 --- a/src/app/openaireLibrary +++ b/src/app/openaireLibrary @@ -1 +1 @@ -Subproject commit 901855daa9cddefad13a94acc9edb09f2500dc96 +Subproject commit a53c4e90d099d0bf3919df55edceaf7f793427d0 diff --git a/src/assets/openaire-theme b/src/assets/openaire-theme index cf3dab8..5268f27 160000 --- a/src/assets/openaire-theme +++ b/src/assets/openaire-theme @@ -1 +1 @@ -Subproject commit cf3dab89f7356b88abfe6f125930076466e8a780 +Subproject commit 5268f277246347aad42349a06eecb915a452841b From c79a65c0e2d12ed677a83c9231f7f911f29c8d60 Mon Sep 17 00:00:00 2001 From: "k.triantafyllou" Date: Wed, 30 Aug 2023 16:48:51 +0300 Subject: [PATCH 6/8] Add bipFrameAPIURL in properties --- src/app/openaireLibrary | 2 +- src/assets/common-assets | 2 +- src/assets/openaire-theme | 2 +- src/environments/environment.beta.ts | 1 + src/environments/environment.prod.ts | 1 + src/environments/environment.ts | 1 + 6 files changed, 6 insertions(+), 3 deletions(-) diff --git a/src/app/openaireLibrary b/src/app/openaireLibrary index a53c4e9..1b98944 160000 --- a/src/app/openaireLibrary +++ b/src/app/openaireLibrary @@ -1 +1 @@ -Subproject commit a53c4e90d099d0bf3919df55edceaf7f793427d0 +Subproject commit 1b989441db0b1f808d1b626d3588901d54ffaf90 diff --git a/src/assets/common-assets b/src/assets/common-assets index 2fd5784..d18e0a7 160000 --- a/src/assets/common-assets +++ b/src/assets/common-assets @@ -1 +1 @@ -Subproject commit 2fd57843f85125e54adfb95b35776755037ea359 +Subproject commit d18e0a7e43e5ab74649481ecbf352ba49893c66f diff --git a/src/assets/openaire-theme b/src/assets/openaire-theme index 5268f27..2df4b37 160000 --- a/src/assets/openaire-theme +++ b/src/assets/openaire-theme @@ -1 +1 @@ -Subproject commit 5268f277246347aad42349a06eecb915a452841b +Subproject commit 2df4b377a3e89b7dd26a011a2e1e1f07fdcedf2a diff --git a/src/environments/environment.beta.ts b/src/environments/environment.beta.ts index 3d362b4..5a048ad 100644 --- a/src/environments/environment.beta.ts +++ b/src/environments/environment.beta.ts @@ -102,6 +102,7 @@ export let properties: EnvProperties = { errorLink: '/error', lastIndexInformationLink: "https://beta.openaire.eu/aggregation-and-content-provision-workflows", showLastIndexInformationLink: true, + bipFrameAPIURL: "https://bip.imsi.athenarc.gr/api/impact-chart?id=", widgetLink: "https://beta.openaire.eu/index.php?option=com_openaire&view=widget&format=raw&projectId=", claimsInformationLink: "https://beta.openaire.eu/linking", depositLearnHowPage: "/participate/deposit/learn-how", diff --git a/src/environments/environment.prod.ts b/src/environments/environment.prod.ts index d3247e0..47cf8df 100644 --- a/src/environments/environment.prod.ts +++ b/src/environments/environment.prod.ts @@ -102,6 +102,7 @@ export let properties: EnvProperties = { errorLink: '/error', lastIndexInformationLink: "https://www.openaire.eu/aggregation-and-content-provision-workflows", showLastIndexInformationLink: true, + bipFrameAPIURL: "https://bip.imsi.athenarc.gr/api/impact-chart?id=", widgetLink: "https://www.openaire.eu/index.php?option=com_openaire&view=widget&format=raw&projectId=", claimsInformationLink: "https://www.openaire.eu/linking", depositLearnHowPage: "/participate/deposit/learn-how", diff --git a/src/environments/environment.ts b/src/environments/environment.ts index 43e6812..f666938 100644 --- a/src/environments/environment.ts +++ b/src/environments/environment.ts @@ -107,6 +107,7 @@ export let properties: EnvProperties = { errorLink: '/error', lastIndexInformationLink: 'https://beta.openaire.eu/aggregation-and-content-provision-workflows', showLastIndexInformationLink: true, + bipFrameAPIURL: "https://bip.imsi.athenarc.gr/api/impact-chart?id=", widgetLink: 'https://beta.openaire.eu/index.php?option=com_openaire&view=widget&format=raw&projectId=', claimsInformationLink: 'https://beta.openaire.eu/linking', depositLearnHowPage: '/participate/deposit/learn-how', From 8da7eafe81bf129407c205d115bacfe0f0380f5a Mon Sep 17 00:00:00 2001 From: "k.triantafyllou" Date: Tue, 5 Sep 2023 17:46:42 +0300 Subject: [PATCH 7/8] Change style of private community when user is not logged in. --- src/app/app.component.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/app/app.component.ts b/src/app/app.component.ts index ef485d0..3ccbbd8 100644 --- a/src/app/app.component.ts +++ b/src/app/app.component.ts @@ -315,7 +315,7 @@ export class AppComponent implements OnInit, OnDestroy { } else { this.properties.adminToolsPortalType = "connect"; if (this.document) { - this.initLayout('connect'); + this.initLayout(this.communityId?this.communityId:'connect'); } } this.configurationService.initPortal(this.properties, (communityId) ? communityId : this.properties.adminToolsPortalType); @@ -455,7 +455,7 @@ export class AppComponent implements OnInit, OnDestroy { } this.showMenu = true; } else { - this.communityId = null; + this.communityId = (this.community && ConnectHelper.isPrivate(this.community, this.user))?this.community.communityId:null; this.configurationService.initPortal(this.properties, "connect"); this.buildConnectMenu(true); if (this.community && this.community.status == "manager") { From 9129ace1f894a814947ccd1376bc5d5b18bc2ce9 Mon Sep 17 00:00:00 2001 From: "k.triantafyllou" Date: Tue, 12 Sep 2023 15:36:41 +0300 Subject: [PATCH 8/8] Revert stepper in search in community's home page --- src/app/community/community.component.html | 20 +++++++++++--------- src/app/community/community.module.ts | 21 ++++++++++++++------- src/app/openaireLibrary | 2 +- 3 files changed, 26 insertions(+), 17 deletions(-) diff --git a/src/app/community/community.component.html b/src/app/community/community.component.html index 3483acb..5a60ce9 100644 --- a/src/app/community/community.component.html +++ b/src/app/community/community.component.html @@ -174,16 +174,18 @@ -
    -
    - - Advanced search - +
    + + +
    +     +
    +
    + +
    -
    diff --git a/src/app/community/community.module.ts b/src/app/community/community.module.ts index 6762dff..66cd34c 100644 --- a/src/app/community/community.module.ts +++ b/src/app/community/community.module.ts @@ -12,29 +12,36 @@ import {InviteModule} from '../utils/subscribe/invite/invite.module'; import {ManageModule} from '../openaireLibrary/utils/manage/manage.module'; import {StatisticsModule} from "../statistics/statistics.module"; -import {SearchZenodoCommunitiesServiceModule} from '../openaireLibrary/connect/zenodoCommunities/searchZenodoCommunitiesService.module'; -import {ZenodoCommunitiesServiceModule} from '../openaireLibrary/connect/zenodoCommunities/zenodo-communitiesService.module'; +import { + SearchZenodoCommunitiesServiceModule +} from '../openaireLibrary/connect/zenodoCommunities/searchZenodoCommunitiesService.module'; +import { + ZenodoCommunitiesServiceModule +} from '../openaireLibrary/connect/zenodoCommunities/zenodo-communitiesService.module'; import {SearchFormModule} from '../openaireLibrary/searchPages/searchUtils/searchForm.module'; -import {SearchDataprovidersServiceModule} from "../openaireLibrary/connect/contentProviders/searchDataprovidersService.module"; +import { + SearchDataprovidersServiceModule +} from "../openaireLibrary/connect/contentProviders/searchDataprovidersService.module"; import {SearchProjectsServiceModule} from '../openaireLibrary/connect/projects/searchProjectsService.module'; import {SearchResearchResultsServiceModule} from "../openaireLibrary/services/searchResearchResultsService.module"; import {SearchResultsModule} from "../openaireLibrary/searchPages/searchUtils/searchResults.module"; import {CuratorsModule} from "../curators/curators.module"; import {AffiliationsModule} from "../affiliations/affiliations.module"; import {SEOServiceModule} from "../openaireLibrary/sharedComponents/SEO/SEOService.module"; -import { MatSelectModule } from "@angular/material/select"; +import {MatSelectModule} from "@angular/material/select"; import {EntitiesSelectionModule} from "../openaireLibrary/searchPages/searchUtils/entitiesSelection.module"; import {TabsModule} from "../openaireLibrary/utils/tabs/tabs.module"; import {SearchTabModule} from "../openaireLibrary/utils/tabs/contents/search-tab.module"; import {ErrorMessagesModule} from "../openaireLibrary/utils/errorMessages.module"; import {SafeHtmlPipeModule} from '../openaireLibrary/utils/pipes/safeHTMLPipe.module'; import {ErrorModule} from "../openaireLibrary/error/error.module"; -import {AdvancedSearchInputModule} from '../openaireLibrary/sharedComponents/advanced-search-input/advanced-search-input.module'; +import { + AdvancedSearchInputModule +} from '../openaireLibrary/sharedComponents/advanced-search-input/advanced-search-input.module'; import {InputModule} from '../openaireLibrary/sharedComponents/input/input.module'; import {QuickSelectionsModule} from '../openaireLibrary/searchPages/searchUtils/quick-selections.module'; import {IconsModule} from '../openaireLibrary/utils/icons/icons.module'; import {NoLoadPaging} from '../openaireLibrary/searchPages/searchUtils/no-load-paging.module'; -import {SearchInputModule} from "../openaireLibrary/sharedComponents/search-input/search-input.module"; @NgModule({ imports: [ @@ -44,7 +51,7 @@ import {SearchInputModule} from "../openaireLibrary/sharedComponents/search-inpu SearchResearchResultsServiceModule, SearchResultsModule, CuratorsModule, AffiliationsModule, SEOServiceModule, MatSelectModule, EntitiesSelectionModule, TabsModule, SearchTabModule, ErrorMessagesModule, SafeHtmlPipeModule, ErrorModule, - AdvancedSearchInputModule, InputModule, QuickSelectionsModule, IconsModule, NoLoadPaging, SearchInputModule + AdvancedSearchInputModule, InputModule, QuickSelectionsModule, IconsModule, NoLoadPaging ], declarations: [ CommunityComponent diff --git a/src/app/openaireLibrary b/src/app/openaireLibrary index 1b98944..f679385 160000 --- a/src/app/openaireLibrary +++ b/src/app/openaireLibrary @@ -1 +1 @@ -Subproject commit 1b989441db0b1f808d1b626d3588901d54ffaf90 +Subproject commit f6793857253fa5ca79e9576b25d0f8d0f67d3835