From 662b514ab5154358c730164aec4101687ad3f1ed Mon Sep 17 00:00:00 2001 From: argirok Date: Fri, 14 Jul 2023 11:43:27 +0300 Subject: [PATCH 01/36] apply initial changes base odn new community API --- src/app/openaireLibrary | 2 +- .../affiliations/affiliations.component.ts | 4 ++- .../remove-content-providers.component.ts | 3 +- .../projects/remove-projects.component.ts | 4 +-- .../manage-zenodo-communities.component.ts | 2 +- .../zenodo-communities.component.ts | 29 +++++++++---------- .../manageContentProviders.service.ts | 2 +- src/app/services/manageProjects.service.ts | 4 +-- .../manageZenodoCommunities.service.ts | 12 +++----- src/assets/common-assets | 2 +- src/assets/openaire-theme | 2 +- 11 files changed, 31 insertions(+), 35 deletions(-) diff --git a/src/app/openaireLibrary b/src/app/openaireLibrary index 8d8eda4..3ee4129 160000 --- a/src/app/openaireLibrary +++ b/src/app/openaireLibrary @@ -1 +1 @@ -Subproject commit 8d8eda416b4873c50f689db54444f135396db56d +Subproject commit 3ee4129c7e76cc7f4c8dcfcf27c135ce873f8f0d diff --git a/src/app/pages/affiliations/affiliations.component.ts b/src/app/pages/affiliations/affiliations.component.ts index 8cba66c..2fd937e 100644 --- a/src/app/pages/affiliations/affiliations.component.ts +++ b/src/app/pages/affiliations/affiliations.component.ts @@ -113,6 +113,7 @@ export class AffiliationsComponent implements OnInit, OnDestroy { deleteAffiliationOpen(index: number) { this.index = index; let affiliation: Affiliation = this.affiliations[index]; + console.log(index, affiliation) this.removeAffiliationModal.alertTitle = 'Delete Organization'; this.removeAffiliationModal.message = 'Do you want to remove ' + affiliation.name + ' from Organizations?'; @@ -164,7 +165,8 @@ export class AffiliationsComponent implements OnInit, OnDestroy { removeAffiliation() { this.loading = true; - this.affiliationService.deleteAffiliation(this.properties.communityAPI + this.community.communityId + '/organizations', + console.log(this.index, this.affiliations[this.index].id) + this.affiliationService.deleteAffiliation(this.properties.communityAPI + this.community.communityId + '/organizations?organizationName='+this.affiliations[this.index].name, this.affiliations[this.index].id).subscribe((deleteOK) => { this.affiliations.splice(this.index, 1); if (this.currentPage.length === 0) { diff --git a/src/app/pages/content-providers/remove-content-providers.component.ts b/src/app/pages/content-providers/remove-content-providers.component.ts index 8fce21e..068add6 100644 --- a/src/app/pages/content-providers/remove-content-providers.component.ts +++ b/src/app/pages/content-providers/remove-content-providers.component.ts @@ -81,7 +81,8 @@ export class RemoveContentProvidersComponent implements OnInit { } public confirmedDeleteContentProvider() { - this.subscriptions.push(this._manageCommunityContentProvidersService.removeContentProvider(this.properties, this.community.communityId, this.selectedCommunityContentProvider.id).subscribe( + console.log(this.selectedCommunityContentProvider) + this.subscriptions.push(this._manageCommunityContentProvidersService.removeContentProvider(this.properties, this.community.communityId, this.selectedCommunityContentProvider.openaireId).subscribe( () => { let index = this.communityContentProviders.indexOf(this.selectedCommunityContentProvider); this.communityContentProviders.splice(index, 1); diff --git a/src/app/pages/projects/remove-projects.component.ts b/src/app/pages/projects/remove-projects.component.ts index b48f89b..5723030 100644 --- a/src/app/pages/projects/remove-projects.component.ts +++ b/src/app/pages/projects/remove-projects.component.ts @@ -133,7 +133,7 @@ export class RemoveProjectsComponent implements OnInit { } public confirmedDeleteProject(data: any) { - this.subscriptions.push(this._manageCommunityProjectsService.removeProject(this.properties, this.community.communityId, this.selectedCommunityProject.id).subscribe( + this.subscriptions.push(this._manageCommunityProjectsService.removeProject(this.properties, this.community.communityId, this.selectedCommunityProject.openaireId).subscribe( data => { let index = this.communityProjects.indexOf(this.selectedCommunityProject); this.communityProjects.splice(index, 1); @@ -189,7 +189,7 @@ export class RemoveProjectsComponent implements OnInit { this.subscriptions.push(this._searchCommunityProjectsService.searchProjects(this.properties, this.community.communityId).subscribe( data => { - this.communityProjects = data; + this.communityProjects = data.content; this.previewCommunityProjects = this.communityProjects; this.sort(); diff --git a/src/app/pages/zenodo-communities/manage-zenodo-communities.component.ts b/src/app/pages/zenodo-communities/manage-zenodo-communities.component.ts index c7c8a82..205e18c 100644 --- a/src/app/pages/zenodo-communities/manage-zenodo-communities.component.ts +++ b/src/app/pages/zenodo-communities/manage-zenodo-communities.component.ts @@ -88,7 +88,7 @@ export class ManageZenodoCommunitiesComponent implements OnInit, OnDestroy { } public confirmedDeleteCommunity(data: any) { - this.subscriptions.push(this._manageZenodoCommunitiesService.removeZCommunity(this.properties, this.community.communityId, this.selectedToDelete.openaireId).subscribe( + this.subscriptions.push(this._manageZenodoCommunitiesService.removeZCommunity(this.properties, this.community.communityId, this.selectedToDelete.id).subscribe( data => { var pos = -1; for (var i = 0; i < this.selectedCommunities.length; i++) { diff --git a/src/app/pages/zenodo-communities/zenodo-communities.component.ts b/src/app/pages/zenodo-communities/zenodo-communities.component.ts index da2d348..4c1cbc9 100644 --- a/src/app/pages/zenodo-communities/zenodo-communities.component.ts +++ b/src/app/pages/zenodo-communities/zenodo-communities.component.ts @@ -65,8 +65,7 @@ export class ZenodoCommunitiesComponent implements OnInit, OnDestroy { this.masterZenodoCommunityId = this.community.zenodoCommunity; if (this.masterZenodoCommunityId) { this.subscriptions.push(this._zenodoCommunitieService.getZenodoCommunityById(this.properties, - this.properties.zenodoCommunities + this.masterZenodoCommunityId, - null).subscribe( + this.properties.zenodoCommunities + this.masterZenodoCommunityId).subscribe( result => { this.masterZenodoCommunity = result; this.selectedCommunities.unshift(this.masterZenodoCommunity); @@ -81,25 +80,24 @@ export class ZenodoCommunitiesComponent implements OnInit, OnDestroy { } this.zenodoSearchUtils.status = this.errorCodes.LOADING; this.zenodoSearchUtils.status = this.errorCodes.LOADING; - this._searchZenodoCommunitiesService.searchZCommunities(this.properties, this.community.communityId).subscribe( - result => { - this.selectedCommunityIds = result; + // this._searchZenodoCommunitiesService.searchZCommunities(this.properties, this.community.communityId).subscribe( + // result => { + this.selectedCommunityIds = this.community.otherZenodoCommunities; this.zenodoSearchUtils.totalResults = this.selectedCommunityIds.length; if (this.selectedCommunityIds.length === 0) { this.zenodoSearchUtils.status = this.errorCodes.NONE; } for (let i = 0; i < this.selectedCommunityIds.length; i++) { this.getZenodoCommunityById( - this.selectedCommunityIds[i]['zenodoid'], - this.selectedCommunityIds[i]['id']); + this.selectedCommunityIds[i]); } - }, - error => { - console.log('list of zenodo communities couldn\'t be loaded'); - this.zenodoSearchUtils.status = this.errorCodes.DONE; - } - ); + // }, + // error => { + // console.log('list of zenodo communities couldn\'t be loaded'); + // this.zenodoSearchUtils.status = this.errorCodes.DONE; + // } + // ); }) ); @@ -116,9 +114,9 @@ export class ZenodoCommunitiesComponent implements OnInit, OnDestroy { }); } - getZenodoCommunityById(zenodoid, openaireId) { + getZenodoCommunityById(zenodoid) { this.subscriptions.push(this._zenodoCommunitieService.getZenodoCommunityById(this.properties, - this.properties.zenodoCommunities + zenodoid, openaireId).subscribe( + this.properties.zenodoCommunities + zenodoid).subscribe( result => { this.selectedCommunities.push(result); this.zenodocommunitiesloadedCount++; @@ -131,7 +129,6 @@ export class ZenodoCommunitiesComponent implements OnInit, OnDestroy { error => { const emptyCommunity: ZenodoCommunityInfo = new ZenodoCommunityInfo(); emptyCommunity.id = zenodoid; - emptyCommunity.openaireId = openaireId; emptyCommunity.title = zenodoid; this.selectedCommunities.push(emptyCommunity); this.zenodocommunitiesloadedCount++; diff --git a/src/app/services/manageContentProviders.service.ts b/src/app/services/manageContentProviders.service.ts index 7be4c2f..0f4eacd 100644 --- a/src/app/services/manageContentProviders.service.ts +++ b/src/app/services/manageContentProviders.service.ts @@ -11,7 +11,7 @@ export class ManageCommunityContentProvidersService { removeContentProvider(properties: EnvProperties, pid: string, id: string): any { let headers = new HttpHeaders({'Content-Type': 'application/json', 'accept': 'application/json'}); - let url = properties.communityAPI + pid + '/contentproviders'; + let url = properties.communityAPI + pid + '/contentproviders?contentproviderId=' +id; return this.http.request('delete', url, {body: id, headers: headers}); } diff --git a/src/app/services/manageProjects.service.ts b/src/app/services/manageProjects.service.ts index 6f99db7..ba5f146 100644 --- a/src/app/services/manageProjects.service.ts +++ b/src/app/services/manageProjects.service.ts @@ -12,9 +12,9 @@ export class ManageCommunityProjectsService { let headers = new HttpHeaders({'Content-Type': 'application/json', 'accept': 'application/json'}); - let url = properties.communityAPI+pid+"/projects"; + let url = properties.communityAPI+pid+"/projects?projectId="+id; //return this.http.delete(url, options) - return this.http.request('delete', url, { body: id, headers: headers}) + return this.http.request('delete', url, { headers: headers}) } addProject(properties:EnvProperties, pid: string, project: any) { diff --git a/src/app/services/manageZenodoCommunities.service.ts b/src/app/services/manageZenodoCommunities.service.ts index 0cdd3a0..8a07c69 100644 --- a/src/app/services/manageZenodoCommunities.service.ts +++ b/src/app/services/manageZenodoCommunities.service.ts @@ -11,10 +11,10 @@ export class ManageZenodoCommunitiesService { //let options = new RequestOptions({headers: headers, body: id}); let headers = new HttpHeaders({'Content-Type': 'application/json', 'accept': 'application/json'}); - let url = properties.communityAPI + pid + "/zenodocommunities"; + let url = properties.communityAPI + pid + "/zenodocommunities?zenodocommunity="+id; //return this.http.delete(url, options); - return this.http.request('delete', url, { body: id, headers: headers}) + return this.http.request('delete', url, { headers: headers}) } addZCommunity(properties:EnvProperties, pid: string,zenodoid: string) { @@ -23,13 +23,9 @@ export class ManageZenodoCommunitiesService { let headers = new HttpHeaders({'Content-Type': 'application/json'}); - let url = properties.communityAPI+pid+"/zenodocommunities"; - var zCommunity: any = { - "communityId": pid, + let url = properties.communityAPI+pid+"/zenodocommunities?zenodocommunity="+zenodoid; - "zenodoid": zenodoid - }; - return this.http.post(url, JSON.stringify(zCommunity), {headers: headers}); + return this.http.post(url, headers); //.map(res => res.json()) } 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..2fffe0f 160000 --- a/src/assets/openaire-theme +++ b/src/assets/openaire-theme @@ -1 +1 @@ -Subproject commit 1e06310b8b2b56f131754eaded615b6cf32c5848 +Subproject commit 2fffe0fa672adcf5577461d10c30e34b00308c85 From d9b0365a1d42dd94599cb4d7c497adf4cfd1e3be Mon Sep 17 00:00:00 2001 From: argirok Date: Fri, 14 Jul 2023 15:00:01 +0300 Subject: [PATCH 02/36] clean up imports for deleted SearchZenodoCommunitiesService --- .../pages/zenodo-communities/zenodo-communities.component.ts | 5 +---- .../pages/zenodo-communities/zenodo-communities.module.ts | 3 +-- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/src/app/pages/zenodo-communities/zenodo-communities.component.ts b/src/app/pages/zenodo-communities/zenodo-communities.component.ts index 4c1cbc9..717c259 100644 --- a/src/app/pages/zenodo-communities/zenodo-communities.component.ts +++ b/src/app/pages/zenodo-communities/zenodo-communities.component.ts @@ -3,8 +3,6 @@ import {ActivatedRoute, Router} from '@angular/router'; import {EnvProperties} from '../../openaireLibrary/utils/properties/env-properties'; import {ZenodoCommunitiesService} from '../../openaireLibrary/connect/zenodoCommunities/zenodo-communities.service'; -import {SearchZenodoCommunitiesService} from '../../openaireLibrary/connect/zenodoCommunities/searchZenodoCommunities.service'; - import {CommunityService} from '../../openaireLibrary/connect/community/community.service'; import {CommunityInfo} from '../../openaireLibrary/connect/community/communityInfo'; import {ZenodoCommunityInfo} from '../../openaireLibrary/connect/zenodoCommunities/zenodoCommunityInfo'; @@ -50,8 +48,7 @@ export class ZenodoCommunitiesComponent implements OnInit, OnDestroy { constructor(private element: ElementRef, private route: ActivatedRoute, private _router: Router, private _zenodoCommunitieService: ZenodoCommunitiesService, private title: Title, - private _communityService: CommunityService, - private _searchZenodoCommunitiesService: SearchZenodoCommunitiesService) { + private _communityService: CommunityService) { } ngOnInit() { diff --git a/src/app/pages/zenodo-communities/zenodo-communities.module.ts b/src/app/pages/zenodo-communities/zenodo-communities.module.ts index 59f1ed6..ebfdd50 100644 --- a/src/app/pages/zenodo-communities/zenodo-communities.module.ts +++ b/src/app/pages/zenodo-communities/zenodo-communities.module.ts @@ -5,7 +5,6 @@ import {RouterModule} from '@angular/router'; import {ManageZenodoCommunitiesComponent} from './manage-zenodo-communities.component'; import {AddZenodoCommunitiesComponent} from './add-zenodo-communities.component'; import {ZenodoCommunitiesComponent} from './zenodo-communities.component'; -import {SearchZenodoCommunitiesServiceModule} from '../../openaireLibrary/connect/zenodoCommunities/searchZenodoCommunitiesService.module'; import {ManageZenodoCommunitiesService} from '../../services/manageZenodoCommunities.service'; import {ZenodoCommunitiesServiceModule} from '../../openaireLibrary/connect/zenodoCommunities/zenodo-communitiesService.module'; import {AlertModalModule} from '../../openaireLibrary/utils/modal/alertModal.module'; @@ -22,7 +21,7 @@ import {PagingModule} from "../../openaireLibrary/utils/paging.module"; @NgModule({ imports: [ - CommonModule, FormsModule, RouterModule, SearchZenodoCommunitiesServiceModule, ZenodoCommunitiesServiceModule, + CommonModule, FormsModule, RouterModule, ZenodoCommunitiesServiceModule, AlertModalModule, ZenodoCommunitiesRoutingModule, PageContentModule, SearchInputModule, IconsModule, NoLoadPaging, LoadingModule, FullScreenModalModule, HTMLToStringPipeModule, PagingModule ], declarations: [ From f63cd1ec600f0a0ce38a3eed89d2a8b9472749f0 Mon Sep 17 00:00:00 2001 From: argirok Date: Wed, 19 Jul 2023 14:26:16 +0300 Subject: [PATCH 03/36] add fields claim and membership in edit form --- .../edit-community.component.ts | 26 +++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/src/app/pages/community-info/profile/edit-community/edit-community.component.ts b/src/app/pages/community-info/profile/edit-community/edit-community.component.ts index 24c0046..69265fc 100644 --- a/src/app/pages/community-info/profile/edit-community/edit-community.component.ts +++ b/src/app/pages/community-info/profile/edit-community/edit-community.component.ts @@ -82,6 +82,16 @@ import {ClearCacheService} from "../../../../openaireLibrary/services/clear-cach placeholder="Visibility status for your community's profile." [options]="statuses" type="select"> +
+
+
+
+
+
`, @@ -91,9 +101,23 @@ export class EditCommunityComponent { public communityFb: UntypedFormGroup; public statuses: Option[] = [ {label: 'Visible', value: 'all'}, + {label: 'Visible [Public*]', value: 'PUBLIC'}, {label: 'Visible to managers', value: 'manager'}, + {label: 'Visible to managers [Restricted*]', value: 'RESTRICTED'}, +/* + {label: 'Hidden [Private*]', value: 'PRIVATE'}, +*/ {label: 'Hidden', value: 'hidden'} ] + public claimOptions: Option[] = [ + {label: 'Anyone can claim', value: 'all'}, + {label: 'Managers only', value: 'managersOnly'}, + {label: 'membersOnly', value: 'membersOnly'} + ] + public membershipOptions: Option[] = [ + {label: 'Anyone can join', value: 'open'}, + {label: 'By invitation', value: 'byInvitation'} + ] public community: CommunityInfo; public isNew: boolean; public properties: EnvProperties = properties @@ -133,6 +157,8 @@ export class EditCommunityComponent { shortName: this.fb.control(this.community.shortTitle, Validators.required), description: this.fb.control(this.community.description), status: this.fb.control(this.community.status), + claim: this.fb.control(this.community.claim), + membership: this.fb.control(this.community.membership), managers: this.fb.control(this.community.managers), isUpload: this.fb.control(this.community.isUpload), logoUrl: this.fb.control(this.community.logoUrl) From 353fe171261bbd9e367c911c7ad7c298eb5f1848 Mon Sep 17 00:00:00 2001 From: "k.triantafyllou" Date: Fri, 4 Aug 2023 10:56:49 +0300 Subject: [PATCH 04/36] Update typescript to version 4.9.5 and remove mining until migration ends --- package.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index f82f848..4a13694 100644 --- a/package.json +++ b/package.json @@ -12,7 +12,7 @@ "test": "ng test", "e2e": "ng e2e", "mining": "chmod +x interactivemining-install.sh && ./interactivemining-install.sh", - "postinstall": "npm run mining", + "after-build-clean": "rm -rf dist/connect-admin/assets/common-assets/.git dist/connect-admin/assets/openaire-theme/.git .angular" }, "private": true, @@ -62,6 +62,6 @@ "karma-jasmine-html-reporter": "^1.6.0", "protractor": "~7.0.0", "ts-node": "~7.0.0", - "typescript": "~4.6.4" + "typescript": "~4.9.5" } } From a97bac9e69e10041a0f6d8933d7fdcfe41206638 Mon Sep 17 00:00:00 2001 From: "k.triantafyllou" Date: Fri, 4 Aug 2023 10:58:04 +0300 Subject: [PATCH 05/36] Migrate angular core and cli to version 15 and update dependencies to be compatible with the newer version. --- package.json | 29 ++++++++++++++--------------- src/test.ts | 6 ------ tsconfig.json | 5 +++-- 3 files changed, 17 insertions(+), 23 deletions(-) diff --git a/package.json b/package.json index 4a13694..cc7b1cd 100644 --- a/package.json +++ b/package.json @@ -12,27 +12,26 @@ "test": "ng test", "e2e": "ng e2e", "mining": "chmod +x interactivemining-install.sh && ./interactivemining-install.sh", - "after-build-clean": "rm -rf dist/connect-admin/assets/common-assets/.git dist/connect-admin/assets/openaire-theme/.git .angular" }, "private": true, "dependencies": { - "@angular/animations": "^14.2.3", + "@angular/animations": "^15.2.9", "@angular/cdk": "^14.2.2", - "@angular/common": "^14.2.3", - "@angular/compiler": "^14.2.3", - "@angular/core": "^14.2.3", - "@angular/forms": "^14.2.3", - "@angular/localize": "^14.2.3", + "@angular/common": "^15.2.9", + "@angular/compiler": "^15.2.9", + "@angular/core": "^15.2.9", + "@angular/forms": "^15.2.9", + "@angular/localize": "^15.2.9", "@angular/material": "^14.2.2", - "@angular/platform-browser": "^14.2.3", - "@angular/platform-browser-dynamic": "^14.2.3", - "@angular/router": "^14.2.3", + "@angular/platform-browser": "^15.2.9", + "@angular/platform-browser-dynamic": "^15.2.9", + "@angular/router": "^15.2.9", "clipboard": "^1.5.16", "core-js": "^2.5.4", "express": "^4.15.2", "jquery": "^3.4.1", - "ng-recaptcha": "^10.0.0", + "ng-recaptcha": "^11.0.0", "ng2-ckeditor": "1.3.7", "ngx-color-picker": "^8.1.0", "rxjs": "^6.5.1", @@ -43,10 +42,10 @@ "zone.js": "~0.11.4" }, "devDependencies": { - "@angular-devkit/build-angular": "^14.2.3", - "@angular/cli": "^14.2.3", - "@angular/compiler-cli": "^14.2.3", - "@angular/language-service": "^14.2.3", + "@angular-devkit/build-angular": "^15.2.9", + "@angular/cli": "^15.2.9", + "@angular/compiler-cli": "^15.2.9", + "@angular/language-service": "^15.2.9", "@types/express": "^4.17.0", "@types/jasmine": "~3.6.0", "@types/jasminewd2": "~2.0.3", diff --git a/src/test.ts b/src/test.ts index 6b03dbe..ae25f27 100644 --- a/src/test.ts +++ b/src/test.ts @@ -7,8 +7,6 @@ import { platformBrowserDynamicTesting } from '@angular/platform-browser-dynamic/testing'; -declare const require: any; - // First, initialize the Angular testing environment. getTestBed().initTestEnvironment( BrowserDynamicTestingModule, @@ -16,7 +14,3 @@ getTestBed().initTestEnvironment( teardown: { destroyAfterEach: false } } ); -// Then we find all the tests. -const context = require.context('./', true, /\.spec\.ts$/); -// And load the modules. -context.keys().map(context); diff --git a/tsconfig.json b/tsconfig.json index fc8b4c1..668d981 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -10,13 +10,14 @@ "moduleResolution": "node", "experimentalDecorators": true, "importHelpers": true, - "target": "es2020", + "target": "ES2022", "typeRoots": [ "node_modules/@types" ], "lib": [ "es2018", "dom" - ] + ], + "useDefineForClassFields": false } } From 0dd4fc6717d992dba7b5cac625ef7132e1da6e23 Mon Sep 17 00:00:00 2001 From: "k.triantafyllou" Date: Fri, 4 Aug 2023 11:00:57 +0300 Subject: [PATCH 06/36] Update material to angular 15. --- package.json | 6 +++--- src/app/openaireLibrary | 2 +- src/app/pages/customization/color.component.ts | 16 ++++++++-------- src/assets/common-assets | 2 +- 4 files changed, 13 insertions(+), 13 deletions(-) diff --git a/package.json b/package.json index cc7b1cd..371efd0 100644 --- a/package.json +++ b/package.json @@ -17,13 +17,13 @@ "private": true, "dependencies": { "@angular/animations": "^15.2.9", - "@angular/cdk": "^14.2.2", + "@angular/cdk": "^15.2.9", "@angular/common": "^15.2.9", "@angular/compiler": "^15.2.9", "@angular/core": "^15.2.9", "@angular/forms": "^15.2.9", "@angular/localize": "^15.2.9", - "@angular/material": "^14.2.2", + "@angular/material": "^15.2.9", "@angular/platform-browser": "^15.2.9", "@angular/platform-browser-dynamic": "^15.2.9", "@angular/router": "^15.2.9", @@ -63,4 +63,4 @@ "ts-node": "~7.0.0", "typescript": "~4.9.5" } -} +} \ No newline at end of file diff --git a/src/app/openaireLibrary b/src/app/openaireLibrary index a53c4e9..3b6822c 160000 --- a/src/app/openaireLibrary +++ b/src/app/openaireLibrary @@ -1 +1 @@ -Subproject commit a53c4e90d099d0bf3919df55edceaf7f793427d0 +Subproject commit 3b6822c71f32512533793e6b57f6ff017f4c874e diff --git a/src/app/pages/customization/color.component.ts b/src/app/pages/customization/color.component.ts index 094100e..eabe19e 100644 --- a/src/app/pages/customization/color.component.ts +++ b/src/app/pages/customization/color.component.ts @@ -21,14 +21,14 @@ import {CustomizationOptions} from '../../openaireLibrary/connect/community/Cust `, styles:[ ` - .color-input{ - width:24px; - height:14px; - border-radius:3px; - border:0.1px solid #707070; - cursor: pointer; - - }` + .color-input{ + width:24px; + height:14px; + border-radius:3px; + border:0.1px solid #707070; + cursor: pointer; + + }` ] }) diff --git a/src/assets/common-assets b/src/assets/common-assets index 2fd5784..9cb1f83 160000 --- a/src/assets/common-assets +++ b/src/assets/common-assets @@ -1 +1 @@ -Subproject commit 2fd57843f85125e54adfb95b35776755037ea359 +Subproject commit 9cb1f835a93501d9566ea2a3123d92eecd73f27d From f11b014248df8224a332fedb135fbe9ee1dd6fd5 Mon Sep 17 00:00:00 2001 From: "k.triantafyllou" Date: Fri, 4 Aug 2023 11:01:49 +0300 Subject: [PATCH 07/36] Update Zone to 0.13.1 --- package.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index 371efd0..d08ebd6 100644 --- a/package.json +++ b/package.json @@ -39,7 +39,7 @@ "ts-md5": "^1.2.0", "tslib": "^2.0.0", "uikit": "3.13.10", - "zone.js": "~0.11.4" + "zone.js": "~0.13.1" }, "devDependencies": { "@angular-devkit/build-angular": "^15.2.9", @@ -63,4 +63,4 @@ "ts-node": "~7.0.0", "typescript": "~4.9.5" } -} \ No newline at end of file +} From 247452b86057909eddc237f0800bded29b357fcb Mon Sep 17 00:00:00 2001 From: "k.triantafyllou" Date: Fri, 4 Aug 2023 11:03:37 +0300 Subject: [PATCH 08/36] Update angular to angular 16. --- package.json | 28 ++++++++++++++-------------- src/app/openaireLibrary | 2 +- 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/package.json b/package.json index d08ebd6..5013c01 100644 --- a/package.json +++ b/package.json @@ -16,22 +16,22 @@ }, "private": true, "dependencies": { - "@angular/animations": "^15.2.9", + "@angular/animations": "^16.1.8", "@angular/cdk": "^15.2.9", - "@angular/common": "^15.2.9", - "@angular/compiler": "^15.2.9", - "@angular/core": "^15.2.9", - "@angular/forms": "^15.2.9", - "@angular/localize": "^15.2.9", + "@angular/common": "^16.1.8", + "@angular/compiler": "^16.1.8", + "@angular/core": "^16.1.8", + "@angular/forms": "^16.1.8", + "@angular/localize": "^16.1.8", "@angular/material": "^15.2.9", - "@angular/platform-browser": "^15.2.9", - "@angular/platform-browser-dynamic": "^15.2.9", - "@angular/router": "^15.2.9", + "@angular/platform-browser": "^16.1.8", + "@angular/platform-browser-dynamic": "^16.1.8", + "@angular/router": "^16.1.8", "clipboard": "^1.5.16", "core-js": "^2.5.4", "express": "^4.15.2", "jquery": "^3.4.1", - "ng-recaptcha": "^11.0.0", + "ng-recaptcha": "^12.0.2", "ng2-ckeditor": "1.3.7", "ngx-color-picker": "^8.1.0", "rxjs": "^6.5.1", @@ -42,10 +42,10 @@ "zone.js": "~0.13.1" }, "devDependencies": { - "@angular-devkit/build-angular": "^15.2.9", - "@angular/cli": "^15.2.9", - "@angular/compiler-cli": "^15.2.9", - "@angular/language-service": "^15.2.9", + "@angular-devkit/build-angular": "^16.1.7", + "@angular/cli": "^16.1.7", + "@angular/compiler-cli": "^16.1.8", + "@angular/language-service": "^16.1.8", "@types/express": "^4.17.0", "@types/jasmine": "~3.6.0", "@types/jasminewd2": "~2.0.3", diff --git a/src/app/openaireLibrary b/src/app/openaireLibrary index 3b6822c..e742988 160000 --- a/src/app/openaireLibrary +++ b/src/app/openaireLibrary @@ -1 +1 @@ -Subproject commit 3b6822c71f32512533793e6b57f6ff017f4c874e +Subproject commit e7429881ca7788fb218cc0063a0bc1e3bdb626f4 From 2943b496ee3fead689cd8a6df0ca0634fc39e240 Mon Sep 17 00:00:00 2001 From: "k.triantafyllou" Date: Fri, 4 Aug 2023 11:04:31 +0300 Subject: [PATCH 09/36] Update material to angular 16. --- package.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/package.json b/package.json index 5013c01..819bf2c 100644 --- a/package.json +++ b/package.json @@ -17,13 +17,13 @@ "private": true, "dependencies": { "@angular/animations": "^16.1.8", - "@angular/cdk": "^15.2.9", + "@angular/cdk": "^16.1.7", "@angular/common": "^16.1.8", "@angular/compiler": "^16.1.8", "@angular/core": "^16.1.8", "@angular/forms": "^16.1.8", "@angular/localize": "^16.1.8", - "@angular/material": "^15.2.9", + "@angular/material": "^16.1.7", "@angular/platform-browser": "^16.1.8", "@angular/platform-browser-dynamic": "^16.1.8", "@angular/router": "^16.1.8", @@ -63,4 +63,4 @@ "ts-node": "~7.0.0", "typescript": "~4.9.5" } -} +} \ No newline at end of file From 2791c7c26b1e180618d206c9d6c1160c9782b6bb Mon Sep 17 00:00:00 2001 From: "k.triantafyllou" Date: Fri, 4 Aug 2023 11:21:30 +0300 Subject: [PATCH 10/36] Add mining and update to angular-16 --- interactivemining-install.sh | 2 +- package.json | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/interactivemining-install.sh b/interactivemining-install.sh index 047dd8c..8aaa876 100755 --- a/interactivemining-install.sh +++ b/interactivemining-install.sh @@ -1,7 +1,7 @@ rm -f interactiveminingv3.tgz git clone https://code-repo.d4science.org/MaDgIK/interactive-mining.git cd interactive-mining/ -git checkout angular-14 +git checkout angular-16 cd interactive-mining-angular-frontend/ npm install npm run packagr diff --git a/package.json b/package.json index 819bf2c..19ca3ed 100644 --- a/package.json +++ b/package.json @@ -12,6 +12,7 @@ "test": "ng test", "e2e": "ng e2e", "mining": "chmod +x interactivemining-install.sh && ./interactivemining-install.sh", + "postinstall": "npm run mining", "after-build-clean": "rm -rf dist/connect-admin/assets/common-assets/.git dist/connect-admin/assets/openaire-theme/.git .angular" }, "private": true, @@ -63,4 +64,4 @@ "ts-node": "~7.0.0", "typescript": "~4.9.5" } -} \ No newline at end of file +} From f8a7d0619ee8f0e3de39582acbfea3c38add9416 Mon Sep 17 00:00:00 2001 From: "k.triantafyllou" Date: Fri, 4 Aug 2023 11:49:19 +0300 Subject: [PATCH 11/36] Update color picker and fix css of mining --- package.json | 2 +- src/mining.scss | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index 19ca3ed..f6f0460 100644 --- a/package.json +++ b/package.json @@ -34,7 +34,7 @@ "jquery": "^3.4.1", "ng-recaptcha": "^12.0.2", "ng2-ckeditor": "1.3.7", - "ngx-color-picker": "^8.1.0", + "ngx-color-picker": "^14.0.0", "rxjs": "^6.5.1", "sass-loader": "7.3.1", "ts-md5": "^1.2.0", diff --git a/src/mining.scss b/src/mining.scss index 75b9615..d1e47b7 100644 --- a/src/mining.scss +++ b/src/mining.scss @@ -1,5 +1,5 @@ @use "sass:meta"; -@import "~interactiveminingv3/assets/css/variables.css"; +@import "node_modules/interactiveminingv3/assets/css/variables.css"; .mining { From df4b9be6fcfdf17537e75d8c3c29255b209b2c61 Mon Sep 17 00:00:00 2001 From: "k.triantafyllou" Date: Wed, 23 Aug 2023 18:37:48 +0300 Subject: [PATCH 12/36] Update uikit to version 3.16.24 --- package.json | 2 +- src/app/openaireLibrary | 2 +- src/assets/common-assets | 2 +- src/assets/openaire-theme | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package.json b/package.json index f6f0460..92dbe8b 100644 --- a/package.json +++ b/package.json @@ -39,7 +39,7 @@ "sass-loader": "7.3.1", "ts-md5": "^1.2.0", "tslib": "^2.0.0", - "uikit": "3.13.10", + "uikit": "3.16.24", "zone.js": "~0.13.1" }, "devDependencies": { diff --git a/src/app/openaireLibrary b/src/app/openaireLibrary index e742988..40ef950 160000 --- a/src/app/openaireLibrary +++ b/src/app/openaireLibrary @@ -1 +1 @@ -Subproject commit e7429881ca7788fb218cc0063a0bc1e3bdb626f4 +Subproject commit 40ef9507150f90d9e50298adb23c29b3d5a9745b diff --git a/src/assets/common-assets b/src/assets/common-assets index 9cb1f83..ae7e623 160000 --- a/src/assets/common-assets +++ b/src/assets/common-assets @@ -1 +1 @@ -Subproject commit 9cb1f835a93501d9566ea2a3123d92eecd73f27d +Subproject commit ae7e623418e7362e80cf9f65db7a004c0857d239 diff --git a/src/assets/openaire-theme b/src/assets/openaire-theme index 5268f27..d52e929 160000 --- a/src/assets/openaire-theme +++ b/src/assets/openaire-theme @@ -1 +1 @@ -Subproject commit 5268f277246347aad42349a06eecb915a452841b +Subproject commit d52e92929799a1626aff66ad413c6db2be521555 From 7568c668b71919ba6f7e4161f4714924e97c94ea Mon Sep 17 00:00:00 2001 From: argirok Date: Wed, 13 Sep 2023 12:13:06 +0300 Subject: [PATCH 13/36] hide membership in edit form until the functionality is ready --- .../profile/edit-community/edit-community.component.ts | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/app/pages/community-info/profile/edit-community/edit-community.component.ts b/src/app/pages/community-info/profile/edit-community/edit-community.component.ts index 69265fc..d44ae48 100644 --- a/src/app/pages/community-info/profile/edit-community/edit-community.component.ts +++ b/src/app/pages/community-info/profile/edit-community/edit-community.component.ts @@ -87,11 +87,12 @@ import {ClearCacheService} from "../../../../openaireLibrary/services/clear-cach placeholder="Who can create links for your community" [options]="claimOptions" type="select"> -
+ +
`, From 4dbf21ba482a2869ee2b81912de567a3428dcb43 Mon Sep 17 00:00:00 2001 From: argirok Date: Wed, 13 Sep 2023 14:38:28 +0300 Subject: [PATCH 14/36] update remove method on the screen you search and add projects and communities --- src/app/pages/projects/add-projects.component.ts | 3 +-- .../zenodo-communities/add-zenodo-communities.component.ts | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/src/app/pages/projects/add-projects.component.ts b/src/app/pages/projects/add-projects.component.ts index c286636..1f0de79 100644 --- a/src/app/pages/projects/add-projects.component.ts +++ b/src/app/pages/projects/add-projects.component.ts @@ -141,8 +141,7 @@ export class AddProjectsComponent implements OnInit { public removeProject(project: any) { let communityProject = this.getCommunityProject(project); - let projectId: string = communityProject['id']; - this.subscriptions.push(this._manageCommunityProjectsService.removeProject(this.properties, this.community.communityId, projectId).subscribe( + this.subscriptions.push(this._manageCommunityProjectsService.removeProject(this.properties, this.community.communityId, communityProject['openaireId']).subscribe( data => { let index = this.communityProjects.indexOf(communityProject); this.communityProjects.splice(index, 1); diff --git a/src/app/pages/zenodo-communities/add-zenodo-communities.component.ts b/src/app/pages/zenodo-communities/add-zenodo-communities.component.ts index b0cfaf6..129b9dd 100644 --- a/src/app/pages/zenodo-communities/add-zenodo-communities.component.ts +++ b/src/app/pages/zenodo-communities/add-zenodo-communities.component.ts @@ -194,7 +194,7 @@ export class AddZenodoCommunitiesComponent implements OnInit { public getOpenaireId(community: any): string { for (let com of this.selectedCommunities) { if (com.id == community.id) { - return com.openaireId; + return com.id; } } return null; From ef19492aad5d594273caf0694b8c356543c77f91 Mon Sep 17 00:00:00 2001 From: "k.triantafyllou" Date: Thu, 14 Sep 2023 21:47:48 +0300 Subject: [PATCH 15/36] Remove types/node from package.json --- package.json | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/package.json b/package.json index 92dbe8b..93b7fb3 100644 --- a/package.json +++ b/package.json @@ -47,11 +47,10 @@ "@angular/cli": "^16.1.7", "@angular/compiler-cli": "^16.1.8", "@angular/language-service": "^16.1.8", + "@types/ckeditor": "^4.9.10", "@types/express": "^4.17.0", "@types/jasmine": "~3.6.0", "@types/jasminewd2": "~2.0.3", - "@types/node": "^12.11.1", - "@types/ckeditor": "^4.9.10", "codelyzer": "^6.0.0", "jasmine-core": "~3.8.0", "jasmine-spec-reporter": "~5.0.0", From 7bcab9023123a12400ae167bac5fbe6c094e6818 Mon Sep 17 00:00:00 2001 From: argirok Date: Tue, 19 Sep 2023 15:59:37 +0300 Subject: [PATCH 16/36] update manage projects page to use paging and search through new communities API --- .../projects/add-projects.component.html | 6 +- .../pages/projects/add-projects.component.ts | 47 ++++++----- .../projects/manage-projects.component.ts | 12 +-- .../projects/remove-projects.component.html | 23 +++--- .../projects/remove-projects.component.ts | 80 ++++++++++--------- 5 files changed, 90 insertions(+), 78 deletions(-) diff --git a/src/app/pages/projects/add-projects.component.html b/src/app/pages/projects/add-projects.component.html index e9e6060..c4858e7 100644 --- a/src/app/pages/projects/add-projects.component.html +++ b/src/app/pages/projects/add-projects.component.html @@ -94,12 +94,12 @@
+ [externalUrl]="projectUrl" [hasLink]="false">
-
+ -
+
diff --git a/src/app/pages/projects/add-projects.component.ts b/src/app/pages/projects/add-projects.component.ts index 1f0de79..7bf8162 100644 --- a/src/app/pages/projects/add-projects.component.ts +++ b/src/app/pages/projects/add-projects.component.ts @@ -19,6 +19,7 @@ import {CommunityInfo} from "../../openaireLibrary/connect/community/communityIn import {OpenaireEntities} from "../../openaireLibrary/utils/properties/searchFields"; import {Filter, Value} from "../../openaireLibrary/searchPages/searchUtils/searchHelperClasses.class"; import {ClearCacheService} from "../../openaireLibrary/services/clear-cache.service"; +import {SearchCommunityProjectsService} from "../../openaireLibrary/connect/projects/searchProjects.service"; declare var UIkit; @@ -38,7 +39,7 @@ export class AddProjectsComponent implements OnInit { public errorCodes: ErrorCodes; public openaireSearchUtils: SearchUtilsClass = new SearchUtilsClass(); @Output() communityProjectsChanged = new EventEmitter(); - @Input() communityProjects = []; + // @Input() communityProjects = []; public openaireProjects = []; public queryParameters: string = ""; @@ -58,7 +59,7 @@ export class AddProjectsComponent implements OnInit { constructor(private route: ActivatedRoute, private _router: Router, private _searchProjectsService: SearchProjectsService, private _manageCommunityProjectsService: ManageCommunityProjectsService, - private _clearCacheService: ClearCacheService, + private _clearCacheService: ClearCacheService, private _searchCommunityProjectsService: SearchCommunityProjectsService, private _fb: UntypedFormBuilder) { this.errorCodes = new ErrorCodes(); this.openaireSearchUtils.status = this.errorCodes.LOADING; @@ -121,15 +122,17 @@ export class AddProjectsComponent implements OnInit { public addProject(project: SearchResult) { this.subscriptions.push(this._manageCommunityProjectsService.addProject(this.properties, this.community.communityId, project).subscribe( data => { - this.communityProjects.push(data); + // this.communityProjects.push(data); this._clearCacheService.purgeBrowserCache(this.openaireEntities.PROJECT+" added", this.community.communityId); + UIkit.notification(this.openaireEntities.PROJECT+' successfully added!', { status: 'success', timeout: 6000, pos: 'bottom-right' }); + project["isPart"] = true; this.communityProjectsChanged.emit({ - value: this.communityProjects, + value: project, }); }, err => { @@ -140,19 +143,20 @@ export class AddProjectsComponent implements OnInit { } public removeProject(project: any) { - let communityProject = this.getCommunityProject(project); - this.subscriptions.push(this._manageCommunityProjectsService.removeProject(this.properties, this.community.communityId, communityProject['openaireId']).subscribe( + // let communityProject = this.getCommunityProject(project); + this.subscriptions.push(this._manageCommunityProjectsService.removeProject(this.properties, this.community.communityId, project['id']).subscribe( data => { - let index = this.communityProjects.indexOf(communityProject); - this.communityProjects.splice(index, 1); + // let index = this.communityProjects.indexOf(communityProject); + // this.communityProjects.splice(index, 1); this._clearCacheService.purgeBrowserCache(this.openaireEntities.PROJECT+" removed", this.community.communityId); UIkit.notification(this.openaireEntities.PROJECT+' successfully removed!', { status: 'success', timeout: 6000, pos: 'bottom-right' }); + project["isPart"] = false; this.communityProjectsChanged.emit({ - value: this.communityProjects, + value: project, }); }, err => { @@ -162,16 +166,19 @@ export class AddProjectsComponent implements OnInit { )); } - public getCommunityProject(project: any): string { - let index: number = 0; - for (let communityProject of this.communityProjects) { - if (communityProject.openaireId == project.id || - (project.code == communityProject.grantId && project.funderShortname == communityProject.funder)) { - return communityProject; + public getCommunityProject(project: any) { + this.subscriptions.push(this._searchCommunityProjectsService.searchProjectsWithPaging(this.properties, this.community.communityId, 1, this.resultsPerPage, project.id, null).subscribe( + data => { + if(data.totalElements > 0){ + project["isPart"] = true; + } + }, + err => { + console.error(err); + //TODO check erros (service not available, bad request) + } - index++; - } - return ""; + )); } getFunders() { @@ -216,7 +223,9 @@ export class AddProjectsComponent implements OnInit { data => { this.openaireSearchUtils.totalResults = data[0]; this.openaireProjects = data[1]; - + for(let project of this.openaireProjects){ + this.getCommunityProject(project); + } this.openaireSearchUtils.status = this.errorCodes.DONE; if (this.openaireSearchUtils.totalResults == 0) { this.openaireSearchUtils.status = this.errorCodes.NONE; diff --git a/src/app/pages/projects/manage-projects.component.ts b/src/app/pages/projects/manage-projects.component.ts index 5264caf..1615f1b 100644 --- a/src/app/pages/projects/manage-projects.component.ts +++ b/src/app/pages/projects/manage-projects.component.ts @@ -16,12 +16,11 @@ import {CommunityService} from "../../openaireLibrary/connect/community/communit @Component({ selector: 'manage-projects', template: ` - + - ` @@ -71,12 +70,13 @@ export class ManageProjectsComponent implements OnInit { } public communityProjectsChanged($event) { - this.communityProjects = $event.value; + /* this.communityProjects = $event.value; this.showLoadingInRemove = false; if (this.fullscreen.isOpen) { this.removeProjectsComponent.applyFilters(); this.removeProjectsComponent.createFunderFilter(); - } + }*/ + this.removeProjectsComponent.getCommunityProjects(); } } diff --git a/src/app/pages/projects/remove-projects.component.html b/src/app/pages/projects/remove-projects.component.html index c5633e9..fc4a4b8 100644 --- a/src/app/pages/projects/remove-projects.component.html +++ b/src/app/pages/projects/remove-projects.component.html @@ -24,11 +24,11 @@
- +
-
+ +
- + [totalResults]="communitySearchUtils.totalResults" customClasses="uk-flex-right">
@@ -67,18 +67,17 @@
-
No {{openaireEntiites.PROJECTS | lowercase}} - for {{community.shortTitle}} + for {{community.shortTitle}} found
-
+
@@ -124,7 +123,7 @@
diff --git a/src/app/pages/projects/remove-projects.component.ts b/src/app/pages/projects/remove-projects.component.ts index 5723030..90d7536 100644 --- a/src/app/pages/projects/remove-projects.component.ts +++ b/src/app/pages/projects/remove-projects.component.ts @@ -19,6 +19,7 @@ import {CommunityInfo} from "../../openaireLibrary/connect/community/communityIn import {HelperFunctions} from "../../openaireLibrary/utils/HelperFunctions.class"; import {NotificationHandler} from "../../openaireLibrary/utils/notification-handler"; import {ClearCacheService} from "../../openaireLibrary/services/clear-cache.service"; +import {debounceTime, distinctUntilChanged} from "rxjs/operators"; @Component({ selector: 'remove-projects', @@ -35,7 +36,7 @@ export class RemoveProjectsComponent implements OnInit { public projectUrl = "https://" + ((properties.environment == "beta" || properties.environment == "development") ? "beta." : "") + "explore.openaire.eu" + properties.searchLinkToProject.split("?")[0]; @Output() communityProjectsChanged = new EventEmitter(); - @Input() public communityProjects = []; + // @Input() public communityProjects = []; public previewCommunityProjects = []; public communitySearchUtils: SearchUtilsClass = new SearchUtilsClass(); public errorCodes: ErrorCodes; @@ -87,21 +88,24 @@ export class RemoveProjectsComponent implements OnInit { sort: this._fb.control(this.sortOptions[0].value) }); - this.subscriptions.push(this.filterForm.get('keyword').valueChanges.subscribe(value => { - this.searchText = new RegExp(value, 'i'); + this.subscriptions.push(this.filterForm.get('keyword').valueChanges.pipe(debounceTime(500), distinctUntilChanged()).subscribe(value => { this.page = 1; - this.applyFilters(); - })); + this._getCommunityProjects(this.page, this.filterForm.get('keyword').value,null ); + })); +/* this.subscriptions.push(this.filterForm.get('funder').valueChanges.subscribe(value => { this.page = 1; - this.applyFilters(); - })); + this._getCommunityProjects(1, this.searchText.toString(),this.fundersCtrl.getRawValue() ); + + }));*/ +/* this.subscriptions.push(this.filterForm.get('sort').valueChanges.subscribe(value => { this.page = 1; this.sort(); })); +*/ this.subscriptions.push(this.communityService.getCommunityAsObservable().subscribe(community => { if (community) { @@ -111,7 +115,7 @@ export class RemoveProjectsComponent implements OnInit { + this.community.communityId + ".openaire.eu" + this.properties.searchLinkToProject.split("?")[0]; this.keyword = ''; - this._getCommunityProjects(); + this._getCommunityProjects(1,this.keyword, null); } })); } @@ -135,16 +139,18 @@ export class RemoveProjectsComponent implements OnInit { public confirmedDeleteProject(data: any) { this.subscriptions.push(this._manageCommunityProjectsService.removeProject(this.properties, this.community.communityId, this.selectedCommunityProject.openaireId).subscribe( data => { - let index = this.communityProjects.indexOf(this.selectedCommunityProject); - this.communityProjects.splice(index, 1); - this.applyFilters(); + // let index = this.communityProjects.indexOf(this.selectedCommunityProject); + // this.communityProjects.splice(index, 1); + // this.applyFilters(); this._clearCacheService.purgeBrowserCache(this.openaireEntiites.PROJECT+" removed", this.community.communityId); NotificationHandler.rise(OpenaireEntities.PROJECT+' successfully removed!'); - this.communityProjectsChanged.emit({ - value: this.communityProjects, - }); - this.communitySearchUtils.totalResults--; - this.communitySearchUtils.page = 1; + // this.communityProjectsChanged.emit({ + // value: this.communityProjects, + // }); + // this.communitySearchUtils.totalResults--; + // this.communitySearchUtils.page = 1; + this._getCommunityProjects(this.communitySearchUtils.page, this.keyword,null); + }, err => { this.handleError('An error has been occurred. Try again later!'); @@ -179,29 +185,21 @@ export class RemoveProjectsComponent implements OnInit { this.alertModalDeleteCommunity.okButtonText = "Yes"; this.alertModalDeleteCommunity.open(); } - - public _getCommunityProjects() { + public getCommunityProjects() { + this._getCommunityProjects(this.communitySearchUtils.page, this.keyword,null ); + } + public _getCommunityProjects(page, keyword, funder) { this.communitySearchUtils.status = this.errorCodes.LOADING; - this.communityProjects = []; - this.communitySearchUtils.totalResults = 0; - this.communitySearchUtils.page = 1; - this.communitySearchUtils.keyword = ""; - - this.subscriptions.push(this._searchCommunityProjectsService.searchProjects(this.properties, this.community.communityId).subscribe( + this.communitySearchUtils.page = page; + this.communitySearchUtils.keyword = keyword; + this.subscriptions.push(this._searchCommunityProjectsService.searchProjectsWithPaging(this.properties, this.community.communityId, this.communitySearchUtils.page, this.resultsPerPage, this.communitySearchUtils.keyword, funder).subscribe( data => { - this.communityProjects = data.content; - this.previewCommunityProjects = this.communityProjects; - this.sort(); - - this.communitySearchUtils.totalResults = data.length; + this.previewCommunityProjects = data.content; + this.communitySearchUtils.totalResults = data.totalElements; this.communitySearchUtils.status = this.errorCodes.DONE; - this.communityProjectsChanged.emit({ - value: this.communityProjects, + value: this.communitySearchUtils.totalResults }); - - this.createFunderFilter(); - this.loading = false; }, err => { @@ -225,18 +223,19 @@ export class RemoveProjectsComponent implements OnInit { let funders: Set = new Set(); this.allOptions = []; let i; - for (i = 0; i < this.communityProjects.length; i++) { + /* for (i = 0; i < this.communityProjects.length; i++) { let funder = this.communityProjects[i].funder; if (funder && !funders.has(funder)) { funders.add(funder); this.allOptions.push({label: funder, value: {id: funder, label: funder}}); } - } + }*/ } public updatePage($event) { HelperFunctions.scroll(); this.page = $event.value; + this._getCommunityProjects(this.page, this.filterForm.get('keyword').value, null); } addNew() { @@ -244,7 +243,7 @@ export class RemoveProjectsComponent implements OnInit { } public applyFilters() { - this.previewCommunityProjects = this.communityProjects.filter(project => { + /*this.previewCommunityProjects = this.communityProjects.filter(project => { return (this.filterCommunityProjectByKeyword(project) && this.filterCommunityProjectByFunder(project)); }); // check paging here!!! @@ -252,8 +251,10 @@ export class RemoveProjectsComponent implements OnInit { this.page = 1; } - this.sort(); + this.sort();*/ + this._getCommunityProjects(1, this.searchText.toString(),this.fundersCtrl.getRawValue() ); } +/* public filterCommunityProjectByKeyword(project): boolean { return this.searchText.toString() === '' @@ -271,7 +272,9 @@ export class RemoveProjectsComponent implements OnInit { } return false; } +*/ +/* private sort() { let sortOption: { sort: string, descending: boolean } = this.filterForm.get('sort').value; @@ -299,6 +302,7 @@ export class RemoveProjectsComponent implements OnInit { return 0; }); } +*/ public onSearchClose() { this.communitySearchUtils.keyword = this.filterForm.get('keyword').value; From ab85ca7e3c6f56d36b17c30b226eda11f3b331f3 Mon Sep 17 00:00:00 2001 From: argirok Date: Mon, 2 Oct 2023 14:07:15 +0300 Subject: [PATCH 17/36] Commit library changes --- src/app/openaireLibrary | 2 +- src/assets/common-assets | 2 +- src/assets/openaire-theme | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/app/openaireLibrary b/src/app/openaireLibrary index 3ee4129..3cf65ef 160000 --- a/src/app/openaireLibrary +++ b/src/app/openaireLibrary @@ -1 +1 @@ -Subproject commit 3ee4129c7e76cc7f4c8dcfcf27c135ce873f8f0d +Subproject commit 3cf65ef134ac8f65396f7d3293ec08b888021f97 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 2fffe0f..2df4b37 160000 --- a/src/assets/openaire-theme +++ b/src/assets/openaire-theme @@ -1 +1 @@ -Subproject commit 2fffe0fa672adcf5577461d10c30e34b00308c85 +Subproject commit 2df4b377a3e89b7dd26a011a2e1e1f07fdcedf2a From 205db8bf108441b5fb8fe032c57a38d7209ccc86 Mon Sep 17 00:00:00 2001 From: argirok Date: Tue, 3 Oct 2023 10:13:04 +0300 Subject: [PATCH 18/36] limit the requests for add projetcs --- src/app/pages/projects/manage-projects.component.ts | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/app/pages/projects/manage-projects.component.ts b/src/app/pages/projects/manage-projects.component.ts index 1615f1b..8ed0d01 100644 --- a/src/app/pages/projects/manage-projects.component.ts +++ b/src/app/pages/projects/manage-projects.component.ts @@ -20,7 +20,7 @@ import {CommunityService} from "../../openaireLibrary/connect/community/communit [loading]="showLoadingInRemove" [community]="community"> - ` @@ -35,6 +35,7 @@ export class ManageProjectsComponent implements OnInit { public body: string = "Send from page"; public properties: EnvProperties = properties; public community: CommunityInfo = null; + modalIsOpen = false; constructor(private element: ElementRef, private title: Title, @@ -67,6 +68,7 @@ export class ManageProjectsComponent implements OnInit { this.fullscreen.back = true; this.fullscreen.okButton = true; this.fullscreen.open(); + this.modalIsOpen = true; } public communityProjectsChanged($event) { From b54fa1eaf921e5089c36534cb74f70357f383e3b Mon Sep 17 00:00:00 2001 From: argirok Date: Wed, 4 Oct 2023 12:17:26 +0300 Subject: [PATCH 19/36] update labels for claimOptions field --- .../profile/edit-community/edit-community.component.ts | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/app/pages/community-info/profile/edit-community/edit-community.component.ts b/src/app/pages/community-info/profile/edit-community/edit-community.component.ts index d44ae48..d418d0b 100644 --- a/src/app/pages/community-info/profile/edit-community/edit-community.component.ts +++ b/src/app/pages/community-info/profile/edit-community/edit-community.component.ts @@ -111,9 +111,10 @@ export class EditCommunityComponent { {label: 'Hidden', value: 'hidden'} ] public claimOptions: Option[] = [ - {label: 'Anyone can claim', value: 'all'}, - {label: 'Managers only', value: 'managersOnly'}, - {label: 'membersOnly', value: 'membersOnly'} + {label: 'Logged in users', value: 'all'}, + {label: 'Members only', value: 'membersOnly'}, + {label: 'Managers only', value: 'managersOnly'} + ] public membershipOptions: Option[] = [ {label: 'Anyone can join', value: 'open'}, From 0b703bceeca4e0802186ae08c66094860c8f7b37 Mon Sep 17 00:00:00 2001 From: argirok Date: Wed, 4 Oct 2023 16:04:42 +0300 Subject: [PATCH 20/36] Community projects: add filtering and sorting --- .../projects/remove-projects.component.html | 19 +-- .../projects/remove-projects.component.ts | 146 ++++-------------- 2 files changed, 42 insertions(+), 123 deletions(-) diff --git a/src/app/pages/projects/remove-projects.component.html b/src/app/pages/projects/remove-projects.component.html index fc4a4b8..59af0c5 100644 --- a/src/app/pages/projects/remove-projects.component.html +++ b/src/app/pages/projects/remove-projects.component.html @@ -28,31 +28,32 @@ [totalResults]="communitySearchUtils.totalResults">
- - +
{ this.page = 1; - this._getCommunityProjects(this.page, this.filterForm.get('keyword').value,null ); + this._getCommunityProjects(this.page, this.filterForm.get('keyword').value,(this.filterForm.get("funder").value? this.filterForm.get("funder").value.id:null), + this.filterForm.get("sort").value.sort ); })); -/* - this.subscriptions.push(this.filterForm.get('funder').valueChanges.subscribe(value => { - this.page = 1; - this._getCommunityProjects(1, this.searchText.toString(),this.fundersCtrl.getRawValue() ); - - }));*/ -/* - this.subscriptions.push(this.filterForm.get('sort').valueChanges.subscribe(value => { this.page = 1; - this.sort(); + this._getCommunityProjects(this.page, this.filterForm.get('keyword').value, this.filterForm.get("funder").value? this.filterForm.get("funder").value.id:null, this.filterForm.get("sort").value.sort ); })); -*/ this.subscriptions.push(this.communityService.getCommunityAsObservable().subscribe(community => { if (community) { @@ -115,6 +102,7 @@ export class RemoveProjectsComponent implements OnInit { + this.community.communityId + ".openaire.eu" + this.properties.searchLinkToProject.split("?")[0]; this.keyword = ''; + this._getCommunityFunders(); this._getCommunityProjects(1,this.keyword, null); } })); @@ -139,16 +127,9 @@ export class RemoveProjectsComponent implements OnInit { public confirmedDeleteProject(data: any) { this.subscriptions.push(this._manageCommunityProjectsService.removeProject(this.properties, this.community.communityId, this.selectedCommunityProject.openaireId).subscribe( data => { - // let index = this.communityProjects.indexOf(this.selectedCommunityProject); - // this.communityProjects.splice(index, 1); - // this.applyFilters(); + this._clearCacheService.purgeBrowserCache(this.openaireEntiites.PROJECT+" removed", this.community.communityId); NotificationHandler.rise(OpenaireEntities.PROJECT+' successfully removed!'); - // this.communityProjectsChanged.emit({ - // value: this.communityProjects, - // }); - // this.communitySearchUtils.totalResults--; - // this.communitySearchUtils.page = 1; this._getCommunityProjects(this.communitySearchUtils.page, this.keyword,null); }, @@ -188,11 +169,11 @@ export class RemoveProjectsComponent implements OnInit { public getCommunityProjects() { this._getCommunityProjects(this.communitySearchUtils.page, this.keyword,null ); } - public _getCommunityProjects(page, keyword, funder) { + public _getCommunityProjects(page, keyword, funder, orderBy = "name" ) { this.communitySearchUtils.status = this.errorCodes.LOADING; this.communitySearchUtils.page = page; this.communitySearchUtils.keyword = keyword; - this.subscriptions.push(this._searchCommunityProjectsService.searchProjectsWithPaging(this.properties, this.community.communityId, this.communitySearchUtils.page, this.resultsPerPage, this.communitySearchUtils.keyword, funder).subscribe( + this.subscriptions.push(this._searchCommunityProjectsService.searchProjectsWithPaging(this.properties, this.community.communityId, this.communitySearchUtils.page, this.resultsPerPage, this.communitySearchUtils.keyword, funder, orderBy).subscribe( data => { this.previewCommunityProjects = data.content; this.communitySearchUtils.totalResults = data.totalElements; @@ -213,23 +194,21 @@ export class RemoveProjectsComponent implements OnInit { } else { this.communitySearchUtils.status = this.errorCodes.NOT_AVAILABLE; } - this.loading = false; } )); } - - public createFunderFilter(): void { - let funders: Set = new Set(); - this.allOptions = []; - let i; - /* for (i = 0; i < this.communityProjects.length; i++) { - let funder = this.communityProjects[i].funder; - if (funder && !funders.has(funder)) { - funders.add(funder); - this.allOptions.push({label: funder, value: {id: funder, label: funder}}); + public _getCommunityFunders() { + this.subscriptions.push(this._searchCommunityProjectsService.getProjectFunders(this.properties, this.community.communityId).subscribe( + data => { + for (let funder of data) { + this.allFunderOptions.push({label: funder, value: {id: funder, label: funder}}); + } + this.previewFunderOptions =[...this.allFunderOptions]; + }, + err => { } - }*/ + )); } public updatePage($event) { @@ -242,67 +221,6 @@ export class RemoveProjectsComponent implements OnInit { this.addProjects.emit(); } - public applyFilters() { - /*this.previewCommunityProjects = this.communityProjects.filter(project => { - return (this.filterCommunityProjectByKeyword(project) && this.filterCommunityProjectByFunder(project)); - }); - // check paging here!!! - if (this.previewCommunityProjects.slice((this.page - 1) * this.resultsPerPage, this.page * this.resultsPerPage).length == 0) { - this.page = 1; - } - - this.sort();*/ - this._getCommunityProjects(1, this.searchText.toString(),this.fundersCtrl.getRawValue() ); - } -/* - - public filterCommunityProjectByKeyword(project): boolean { - return this.searchText.toString() === '' - || ((project.name + " " + project.acronym + " " + project.grantId + " " + project.funder)).match(this.searchText) != null; - } - - public filterCommunityProjectByFunder(project): boolean { - if (this.fundersCtrl.getRawValue().length == 0) { - return true; - } - for (let funder of this.fundersCtrl.getRawValue()) { - if (project.funder.toLowerCase().indexOf(funder.label.toLowerCase()) != -1) { - return true; - } - } - return false; - } -*/ - -/* - private sort() { - let sortOption: { sort: string, descending: boolean } = this.filterForm.get('sort').value; - - this.previewCommunityProjects.sort((left, right): number => { - if (sortOption.sort == "title") { - if ((left.name + left.acronym) > (right.name + right.acronym)) { - return sortOption.descending ? -1 : 1; - } else if ((left.name + left.acronym) < (right.name + right.acronym)) { - return sortOption.descending ? 1 : -1; - } - } else if (sortOption.sort == "grant") { - if (left.grantId > right.grantId) { - return sortOption.descending ? -1 : 1; - } else if (left.grantId < right.grantId) { - return sortOption.descending ? 1 : -1; - } - } else if (sortOption.sort == "funder") { - if (left.funder > right.funder) { - return sortOption.descending ? -1 : 1; - } else if (left.funder < right.funder) { - return sortOption.descending ? 1 : -1; - } - } - - return 0; - }); - } -*/ public onSearchClose() { this.communitySearchUtils.keyword = this.filterForm.get('keyword').value; @@ -317,23 +235,23 @@ export class RemoveProjectsComponent implements OnInit { NotificationHandler.rise(message, 'danger'); } - select(value: string, event, dropdownFilter: DropdownFilterComponent) { + select(option, event, dropdownFilter: DropdownFilterComponent) { + console.log(option) if(event.target instanceof HTMLInputElement) { dropdownFilter.closeDropdown(); - if(event.target.checked && !this.selectedFunders.find(entity => value === entity)) { - this.selectedFunders.push(value); - this.fundersCtrl.setControl(this.fundersCtrl.value.length, this._fb.control(value)); + if(event.target.checked) { + this.filterForm.get("funder").setValue(option.value); + this._getCommunityProjects(1, this.filterForm.get('keyword').value, this.filterForm.get('funder').value.id ); + this.previewFunderOptions =[option]; } else if(!event.target.checked) { - let index = this.selectedFunders.indexOf(value); - if(index !== -1) { - this.selectedFunders.splice(index, 1); - this.fundersCtrl.removeAt(index); - } + this.filterForm.get("funder").setValue(null); + this._getCommunityProjects(1, this.filterForm.get('keyword').value,null); + this.previewFunderOptions =[...this.allFunderOptions]; } } } isSelected(value: string) { - return this.filterForm && this.filterForm.get('funder').value.find(funder => funder === value) + return this.filterForm && this.filterForm.get('funder').value && this.filterForm.get('funder').value.id === value; } } From 4076f96fb12f0f7edf4326cde299ff6de93257e0 Mon Sep 17 00:00:00 2001 From: "k.triantafyllou" Date: Fri, 6 Oct 2023 15:28:23 +0300 Subject: [PATCH 21/36] Update libraries --- src/app/openaireLibrary | 2 +- src/assets/common-assets | 2 +- src/assets/openaire-theme | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/app/openaireLibrary b/src/app/openaireLibrary index 55a995a..5a92373 160000 --- a/src/app/openaireLibrary +++ b/src/app/openaireLibrary @@ -1 +1 @@ -Subproject commit 55a995a34890318b024d458cdd978a9d044d8b47 +Subproject commit 5a9237399e1eb1e04fb5ba485955b02b09bc6eeb diff --git a/src/assets/common-assets b/src/assets/common-assets index ae7e623..9e58421 160000 --- a/src/assets/common-assets +++ b/src/assets/common-assets @@ -1 +1 @@ -Subproject commit ae7e623418e7362e80cf9f65db7a004c0857d239 +Subproject commit 9e58421a1adf3fbeb361e21616feaea8c7f867af diff --git a/src/assets/openaire-theme b/src/assets/openaire-theme index 5feca2d..fd101a6 160000 --- a/src/assets/openaire-theme +++ b/src/assets/openaire-theme @@ -1 +1 @@ -Subproject commit 5feca2d8457324999557feb662b4355d8cf0df4b +Subproject commit fd101a6b54f7b8b36bdef015d77365fb41a353df From 5a4e76b0c27f5e6bc2c8cfea64e8e7aba5e192a3 Mon Sep 17 00:00:00 2001 From: "konstantina.galouni" Date: Fri, 6 Oct 2023 15:42:25 +0300 Subject: [PATCH 22/36] Connect | develop: environments/: Added property swhURL --- src/environments/environment.beta.ts | 1 + src/environments/environment.prod.ts | 1 + src/environments/environment.ts | 1 + 3 files changed, 3 insertions(+) diff --git a/src/environments/environment.beta.ts b/src/environments/environment.beta.ts index 137b521..a10968d 100644 --- a/src/environments/environment.beta.ts +++ b/src/environments/environment.beta.ts @@ -25,6 +25,7 @@ export let properties: EnvProperties = { cordisURL: "http://cordis.europa.eu/projects/", openDoarURL: "http://v2.sherpa.ac.uk/id/repository/", r3DataURL: "http://service.re3data.org/repository/", + swhURL: "https://archive.softwareheritage.org/", sherpaURL: "http://www.sherpa.ac.uk/romeo/search.php?issn=", zenodo: "https://zenodo.org/", zenodoCommunities: "https://zenodo.org/api/communities/", diff --git a/src/environments/environment.prod.ts b/src/environments/environment.prod.ts index d7f07da..d916388 100644 --- a/src/environments/environment.prod.ts +++ b/src/environments/environment.prod.ts @@ -25,6 +25,7 @@ export let properties: EnvProperties = { cordisURL: "http://cordis.europa.eu/projects/", openDoarURL: "http://v2.sherpa.ac.uk/id/repository/", r3DataURL: "http://service.re3data.org/repository/", + swhURL: "https://archive.softwareheritage.org/", sherpaURL: "http://www.sherpa.ac.uk/romeo/search.php?issn=", zenodo: "https://zenodo.org/", zenodoCommunities: "https://zenodo.org/api/communities/", diff --git a/src/environments/environment.ts b/src/environments/environment.ts index fb69099..fa9ff2e 100644 --- a/src/environments/environment.ts +++ b/src/environments/environment.ts @@ -30,6 +30,7 @@ export let properties: EnvProperties = { cordisURL: 'http://cordis.europa.eu/projects/', openDoarURL: 'http://v2.sherpa.ac.uk/id/repository/', r3DataURL: 'http://service.re3data.org/repository/', + swhURL: "https://archive.softwareheritage.org/", sherpaURL: 'http://www.sherpa.ac.uk/romeo/search.php?issn=', zenodo: 'https://zenodo.org/', zenodoCommunities: 'https://zenodo.org/api/communities/', From 0ef15e01cf4acce4f1783bf89f8020683dd48568 Mon Sep 17 00:00:00 2001 From: argirok Date: Fri, 6 Oct 2023 21:00:30 +0300 Subject: [PATCH 23/36] commit 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 3cf65ef..5e4aaab 160000 --- a/src/app/openaireLibrary +++ b/src/app/openaireLibrary @@ -1 +1 @@ -Subproject commit 3cf65ef134ac8f65396f7d3293ec08b888021f97 +Subproject commit 5e4aaab04f89446f956d524469ef2a856f556de5 diff --git a/src/assets/openaire-theme b/src/assets/openaire-theme index 2df4b37..ac458b5 160000 --- a/src/assets/openaire-theme +++ b/src/assets/openaire-theme @@ -1 +1 @@ -Subproject commit 2df4b377a3e89b7dd26a011a2e1e1f07fdcedf2a +Subproject commit ac458b5a6d156167d7b6c9005ef1f9cfac75d3ae From e5a4472c6d6ef3e0f138c114bdbfa8add5cfee6b Mon Sep 17 00:00:00 2001 From: "k.triantafyllou" Date: Mon, 9 Oct 2023 17:14:43 +0300 Subject: [PATCH 24/36] Edit community fix margin in logo section --- .../profile/edit-community/edit-community.component.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/app/pages/community-info/profile/edit-community/edit-community.component.ts b/src/app/pages/community-info/profile/edit-community/edit-community.component.ts index d418d0b..6d9ba30 100644 --- a/src/app/pages/community-info/profile/edit-community/edit-community.component.ts +++ b/src/app/pages/community-info/profile/edit-community/edit-community.component.ts @@ -42,7 +42,7 @@ import {ClearCacheService} from "../../../../openaireLibrary/services/clear-cach
-
+
-
+
-
+
- - +
`, diff --git a/src/app/pages/users/users-managers/users-managers.component.ts b/src/app/pages/users/users-managers/users-managers.component.ts index 3eeede6..ecb8256 100644 --- a/src/app/pages/users/users-managers/users-managers.component.ts +++ b/src/app/pages/users/users-managers/users-managers.component.ts @@ -25,12 +25,11 @@ export class UsersManagersComponent implements OnInit { public message: string; public inviteDisableMessage: string; public emailComposer: Function = (name, recipient, role):Email => { - return Composer.composeEmailForCommunityDashboard(name, recipient); + return Composer.composeEmailForCommunityDashboard(name, role, recipient); } private subscriptions: any[] = []; constructor(private communityService: CommunityService, - private route: ActivatedRoute, private title: Title) { } diff --git a/src/app/pages/users/users-subscribers/users-subscribers.component.ts b/src/app/pages/users/users-subscribers/users-subscribers.component.ts index e432e46..02063ec 100644 --- a/src/app/pages/users/users-subscribers/users-subscribers.component.ts +++ b/src/app/pages/users/users-subscribers/users-subscribers.component.ts @@ -4,24 +4,36 @@ import {ActivatedRoute} from "@angular/router"; import {CommunityService} from "../../../openaireLibrary/connect/community/community.service"; import {Subscriber} from "rxjs"; import {CommunityInfo} from "../../../openaireLibrary/connect/community/communityInfo"; +import {Email} from "../../../openaireLibrary/utils/email/email"; +import {Composer} from "../../../openaireLibrary/utils/email/composer"; +import {properties} from "../../../../environments/environment"; @Component({ selector: 'users-subscribers', template: ` - + + + ` }) export class UsersSubscribersComponent implements OnInit { public community: CommunityInfo; + public link: string; public loading: boolean; + public message: string; public inviteDisableMessage: string; + public emailComposer: Function = (name, recipient, role):Email => { + return Composer.composeEmailForCommunityDashboard(name, role, recipient); + } private subscriptions: any[] = []; constructor(private communityService: CommunityService, - private route: ActivatedRoute, private title: Title) { } @@ -30,7 +42,10 @@ export class UsersSubscribersComponent implements OnInit { this.subscriptions.push(this.communityService.getCommunityAsObservable().subscribe(community => { if(community) { this.community = community; - this.title.setTitle(this.community.shortTitle.toUpperCase() + " | Subscribers"); + this.title.setTitle(this.community.shortTitle.toUpperCase() + " | Members"); + this.link = this.getURL(this.community.communityId); + this.message = 'A member can access the community dashboard and link research results with projects, ' + + 'communities and other research projects.'; if(community.status !== "all") { this.inviteDisableMessage = "Community's status is " + (community.status === 'manager'?'Visible to managers':'Hidden') + " and invitation to join the Research community dashboard is disabled. Update the community status to enable invitations." } @@ -46,4 +61,8 @@ export class UsersSubscribersComponent implements OnInit { } }); } + + private getURL(id: string): string { + return 'https://' + (properties.environment !== "production"?'beta.':'') + id + ".openaire.eu?verify="; + } } diff --git a/src/app/pages/users/users-subscribers/users-subscribers.module.ts b/src/app/pages/users/users-subscribers/users-subscribers.module.ts index 7865cfe..62b0293 100644 --- a/src/app/pages/users/users-subscribers/users-subscribers.module.ts +++ b/src/app/pages/users/users-subscribers/users-subscribers.module.ts @@ -5,11 +5,12 @@ import {LoadingModule} from "../../../openaireLibrary/utils/loading/loading.modu import {RouterModule} from "@angular/router"; import {SubscribersModule} from "../../../openaireLibrary/dashboard/users/subscribers/subscribers.module"; import {UsersTabsModule} from '../users-tabs.module'; +import {RoleUsersModule} from "../../../openaireLibrary/dashboard/users/role-users/role-users.module"; @NgModule({ imports: [CommonModule, LoadingModule, RouterModule.forChild([ {path: '', component: UsersSubscribersComponent} - ]), SubscribersModule, UsersTabsModule], + ]), SubscribersModule, UsersTabsModule, RoleUsersModule], declarations: [UsersSubscribersComponent], exports: [UsersSubscribersComponent] }) diff --git a/src/assets/openaire-theme b/src/assets/openaire-theme index ac458b5..2df4b37 160000 --- a/src/assets/openaire-theme +++ b/src/assets/openaire-theme @@ -1 +1 @@ -Subproject commit ac458b5a6d156167d7b6c9005ef1f9cfac75d3ae +Subproject commit 2df4b377a3e89b7dd26a011a2e1e1f07fdcedf2a From e2122bd14e2ffabaf58e46d611a49695f74c7e48 Mon Sep 17 00:00:00 2001 From: "k.triantafyllou" Date: Tue, 10 Oct 2023 22:49:15 +0300 Subject: [PATCH 26/36] 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 4686ebe..69bbccd 160000 --- a/src/app/openaireLibrary +++ b/src/app/openaireLibrary @@ -1 +1 @@ -Subproject commit 4686ebe5f4acf97faf41b3e430f7452c406dbad5 +Subproject commit 69bbccd0097df2aec4771c101be3e559e6c3d505 diff --git a/src/assets/openaire-theme b/src/assets/openaire-theme index fe7394e..2dadcf8 160000 --- a/src/assets/openaire-theme +++ b/src/assets/openaire-theme @@ -1 +1 @@ -Subproject commit fe7394ea9ed4319a3234a00b0c8ce09023f50799 +Subproject commit 2dadcf85926bc0f11fff22ed94dc197ddd8587c6 From 1907f6f7236a2df0b179feca13da2781e3de82c0 Mon Sep 17 00:00:00 2001 From: argirok Date: Wed, 18 Oct 2023 15:29:51 +0300 Subject: [PATCH 27/36] beta properties: use new claims service --- src/environments/environment.beta.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/environments/environment.beta.ts b/src/environments/environment.beta.ts index a10968d..9c045fe 100644 --- a/src/environments/environment.beta.ts +++ b/src/environments/environment.beta.ts @@ -8,7 +8,7 @@ export let properties: EnvProperties = { enablePiwikTrack: false, useCache: false, framesAPIURL: "https://beta.openaire.eu/stats3/", - claimsAPIURL: "https://beta.services.openaire.eu/claims/rest/claimsService/", + claimsAPIURL: "https://beta.services.openaire.eu/claims-new/rest/claimsService/", statisticsAPIURL: "https://beta.services.openaire.eu/stats-api/", statisticsFrameAPIURL: "https://beta.openaire.eu/stats/", statisticsFrameNewAPIURL: "https://stats.madgik.di.uoa.gr/stats-api/", From ba9f7db240c49f78ddf6aba43d490bb2bd6e9368 Mon Sep 17 00:00:00 2001 From: argirok Date: Mon, 23 Oct 2023 14:45:27 +0300 Subject: [PATCH 28/36] [angular-16-update-zenodo-api | DONE | UPDATE] : update zenodo community API - update method signatures --- .../pages/zenodo-communities/zenodo-communities.component.ts | 4 ++-- src/environments/environment.beta.ts | 2 +- src/environments/environment.prod.ts | 2 +- src/environments/environment.ts | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/app/pages/zenodo-communities/zenodo-communities.component.ts b/src/app/pages/zenodo-communities/zenodo-communities.component.ts index 717c259..54080c3 100644 --- a/src/app/pages/zenodo-communities/zenodo-communities.component.ts +++ b/src/app/pages/zenodo-communities/zenodo-communities.component.ts @@ -62,7 +62,7 @@ export class ZenodoCommunitiesComponent implements OnInit, OnDestroy { this.masterZenodoCommunityId = this.community.zenodoCommunity; if (this.masterZenodoCommunityId) { this.subscriptions.push(this._zenodoCommunitieService.getZenodoCommunityById(this.properties, - this.properties.zenodoCommunities + this.masterZenodoCommunityId).subscribe( + this.masterZenodoCommunityId).subscribe( result => { this.masterZenodoCommunity = result; this.selectedCommunities.unshift(this.masterZenodoCommunity); @@ -113,7 +113,7 @@ export class ZenodoCommunitiesComponent implements OnInit, OnDestroy { getZenodoCommunityById(zenodoid) { this.subscriptions.push(this._zenodoCommunitieService.getZenodoCommunityById(this.properties, - this.properties.zenodoCommunities + zenodoid).subscribe( + zenodoid).subscribe( result => { this.selectedCommunities.push(result); this.zenodocommunitiesloadedCount++; diff --git a/src/environments/environment.beta.ts b/src/environments/environment.beta.ts index 9c045fe..cc006c7 100644 --- a/src/environments/environment.beta.ts +++ b/src/environments/environment.beta.ts @@ -28,7 +28,7 @@ export let properties: EnvProperties = { swhURL: "https://archive.softwareheritage.org/", sherpaURL: "http://www.sherpa.ac.uk/romeo/search.php?issn=", zenodo: "https://zenodo.org/", - zenodoCommunities: "https://zenodo.org/api/communities/", + zenodoCommunities: "https://zenodo.org/api/communities", openAccess: "https://www.openaire.eu/support/faq#article-id-234", openAccessRepo: "https://www.openaire.eu/support/faq#article-id-310", fp7Guidlines: "https://www.openaire.eu/open-access-in-fp7-seventh-research-framework-programme", diff --git a/src/environments/environment.prod.ts b/src/environments/environment.prod.ts index d916388..d22b1e5 100644 --- a/src/environments/environment.prod.ts +++ b/src/environments/environment.prod.ts @@ -28,7 +28,7 @@ export let properties: EnvProperties = { swhURL: "https://archive.softwareheritage.org/", sherpaURL: "http://www.sherpa.ac.uk/romeo/search.php?issn=", zenodo: "https://zenodo.org/", - zenodoCommunities: "https://zenodo.org/api/communities/", + zenodoCommunities: "https://zenodo.org/api/communities", openAccess: "https://www.openaire.eu/support/faq#article-id-234", openAccessRepo: "https://www.openaire.eu/support/faq#article-id-310", fp7Guidlines: "https://www.openaire.eu/open-access-in-fp7-seventh-research-framework-programme", diff --git a/src/environments/environment.ts b/src/environments/environment.ts index fa9ff2e..b40e3d1 100644 --- a/src/environments/environment.ts +++ b/src/environments/environment.ts @@ -33,7 +33,7 @@ export let properties: EnvProperties = { swhURL: "https://archive.softwareheritage.org/", sherpaURL: 'http://www.sherpa.ac.uk/romeo/search.php?issn=', zenodo: 'https://zenodo.org/', - zenodoCommunities: 'https://zenodo.org/api/communities/', + zenodoCommunities: 'https://zenodo.org/api/communities', openAccess: 'https://www.openaire.eu/support/faq#article-id-234', openAccessRepo: 'https://www.openaire.eu/support/faq#article-id-310', fp7Guidlines: 'https://www.openaire.eu/open-access-in-fp7-seventh-research-framework-programme', From 4ce3080146af89f1b480f5659c2955f3b7f0f5a4 Mon Sep 17 00:00:00 2001 From: "k.triantafyllou" Date: Wed, 25 Oct 2023 15:30:50 +0300 Subject: [PATCH 29/36] [angular-16 | DONE | CHANGED]: Make dashboard-sidebar sticky instead of fixed. --- src/app/app.component.html | 10 ++++------ src/app/openaireLibrary | 2 +- src/assets/common-assets | 2 +- 3 files changed, 6 insertions(+), 8 deletions(-) diff --git a/src/app/app.component.html b/src/app/app.component.html index c6796f9..266b2f1 100644 --- a/src/app/app.component.html +++ b/src/app/app.component.html @@ -2,17 +2,15 @@
- + +
- - -
-
diff --git a/src/app/openaireLibrary b/src/app/openaireLibrary index 69bbccd..660387b 160000 --- a/src/app/openaireLibrary +++ b/src/app/openaireLibrary @@ -1 +1 @@ -Subproject commit 69bbccd0097df2aec4771c101be3e559e6c3d505 +Subproject commit 660387b8da13f36a656d7965a0147d7302fb3749 diff --git a/src/assets/common-assets b/src/assets/common-assets index 9e58421..0a58acb 160000 --- a/src/assets/common-assets +++ b/src/assets/common-assets @@ -1 +1 @@ -Subproject commit 9e58421a1adf3fbeb361e21616feaea8c7f867af +Subproject commit 0a58acbbd45074327642e132cd7deae31188a978 From 1c8e46df21726cb3d2acfe8df3d96fcf02c3f1cc Mon Sep 17 00:00:00 2001 From: argirok Date: Thu, 26 Oct 2023 09:49:04 +0300 Subject: [PATCH 30/36] [angular-16-community-projects-availableSince | DONE | UPDATE] : show project link only when it is available before the db update date --- src/app/pages/projects/remove-projects.component.html | 4 ++-- src/app/pages/projects/remove-projects.component.ts | 10 ++++++++-- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/src/app/pages/projects/remove-projects.component.html b/src/app/pages/projects/remove-projects.component.html index 59af0c5..ce7d1ab 100644 --- a/src/app/pages/projects/remove-projects.component.html +++ b/src/app/pages/projects/remove-projects.component.html @@ -82,14 +82,14 @@
- {{item.name}} ({{item.acronym}}) [no title available] - + {{item.name}} ({{item.acronym}}) [no title available] diff --git a/src/app/pages/projects/remove-projects.component.ts b/src/app/pages/projects/remove-projects.component.ts index d5bc5fb..c930aef 100644 --- a/src/app/pages/projects/remove-projects.component.ts +++ b/src/app/pages/projects/remove-projects.component.ts @@ -20,6 +20,7 @@ import {HelperFunctions} from "../../openaireLibrary/utils/HelperFunctions.class import {NotificationHandler} from "../../openaireLibrary/utils/notification-handler"; import {ClearCacheService} from "../../openaireLibrary/services/clear-cache.service"; import {debounceTime, distinctUntilChanged} from "rxjs/operators"; +import {IndexInfoService} from "../../openaireLibrary/utils/indexInfo.service"; @Component({ selector: 'remove-projects', @@ -63,18 +64,21 @@ export class RemoveProjectsComponent implements OnInit { ]; public openaireEntiites = OpenaireEntities; - + lastDBLoadDate = null; constructor(private route: ActivatedRoute, private _router: Router, private _fb: UntypedFormBuilder, private communityService: CommunityService, private _manageCommunityProjectsService: ManageCommunityProjectsService, private _searchCommunityProjectsService: SearchCommunityProjectsService, - private _clearCacheService: ClearCacheService) { + private _clearCacheService: ClearCacheService, private indexInfoService: IndexInfoService) { this.errorCodes = new ErrorCodes(); this.communitySearchUtils.status = this.errorCodes.LOADING; } ngOnInit() { + this.subscriptions.push(this.indexInfoService.getDBLoadLastDate(this.properties).subscribe(res => { + this.lastDBLoadDate = res; + })); this.communitySearchUtils.keyword = ""; this.filterForm = this._fb.group({ @@ -254,4 +258,6 @@ export class RemoveProjectsComponent implements OnInit { isSelected(value: string) { return this.filterForm && this.filterForm.get('funder').value && this.filterForm.get('funder').value.id === value; } + + } From 24ed9f06908cc1e24ad58a21ad070bb5bc9374da Mon Sep 17 00:00:00 2001 From: "k.triantafyllou" Date: Fri, 27 Oct 2023 17:39:53 +0300 Subject: [PATCH 31/36] [angular-16 | FIXED]: Fix width of main content --- src/app/app.component.html | 2 +- src/app/openaireLibrary | 2 +- src/assets/common-assets | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/app/app.component.html b/src/app/app.component.html index 266b2f1..b63493a 100644 --- a/src/app/app.component.html +++ b/src/app/app.component.html @@ -8,7 +8,7 @@
-
+
diff --git a/src/app/openaireLibrary b/src/app/openaireLibrary index 660387b..64e8919 160000 --- a/src/app/openaireLibrary +++ b/src/app/openaireLibrary @@ -1 +1 @@ -Subproject commit 660387b8da13f36a656d7965a0147d7302fb3749 +Subproject commit 64e8919925eb283df124fc1bcef826a5b62bf991 diff --git a/src/assets/common-assets b/src/assets/common-assets index 0a58acb..d1b2d5e 160000 --- a/src/assets/common-assets +++ b/src/assets/common-assets @@ -1 +1 @@ -Subproject commit 0a58acbbd45074327642e132cd7deae31188a978 +Subproject commit d1b2d5e585722751792d12645d17f820cd6a7860 From 1b23a25e241fb410939b1174fb3223755de059f2 Mon Sep 17 00:00:00 2001 From: argirok Date: Thu, 2 Nov 2023 09:22:42 +0200 Subject: [PATCH 32/36] [develop | DONE | UPDATED] :users-managers component add missing attribute to composer function --- src/app/pages/users/users-managers/users-managers.component.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/app/pages/users/users-managers/users-managers.component.ts b/src/app/pages/users/users-managers/users-managers.component.ts index 3eeede6..0589cc1 100644 --- a/src/app/pages/users/users-managers/users-managers.component.ts +++ b/src/app/pages/users/users-managers/users-managers.component.ts @@ -25,7 +25,7 @@ export class UsersManagersComponent implements OnInit { public message: string; public inviteDisableMessage: string; public emailComposer: Function = (name, recipient, role):Email => { - return Composer.composeEmailForCommunityDashboard(name, recipient); + return Composer.composeEmailForCommunityDashboard(name, role, recipient); } private subscriptions: any[] = []; From a02dbded6ecd4fa52df05faad0a9b053cea39c45 Mon Sep 17 00:00:00 2001 From: argirok Date: Thu, 2 Nov 2023 09:47:36 +0200 Subject: [PATCH 33/36] [develop | WIP] : properties: add comments what to check --- src/app/openaireLibrary | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/app/openaireLibrary b/src/app/openaireLibrary index 5e4aaab..3e656de 160000 --- a/src/app/openaireLibrary +++ b/src/app/openaireLibrary @@ -1 +1 @@ -Subproject commit 5e4aaab04f89446f956d524469ef2a856f556de5 +Subproject commit 3e656de39ca585a307b558e46c26de61afc35b96 From 2d6b144441db6060f8c182b6ee4867adb12195df Mon Sep 17 00:00:00 2001 From: argirok Date: Thu, 2 Nov 2023 09:48:18 +0200 Subject: [PATCH 34/36] [develop | DONE | UPDATED] properties: use library properties --- src/environments/environment.beta.ts | 94 +++------------------------ src/environments/environment.prod.ts | 95 +++------------------------- src/environments/environment.ts | 95 +++------------------------- 3 files changed, 27 insertions(+), 257 deletions(-) diff --git a/src/environments/environment.beta.ts b/src/environments/environment.beta.ts index a10968d..a4f0b30 100644 --- a/src/environments/environment.beta.ts +++ b/src/environments/environment.beta.ts @@ -1,92 +1,14 @@ import {EnvProperties} from '../app/openaireLibrary/utils/properties/env-properties'; +import {common, commonBeta, commonProd} from "../app/openaireLibrary/utils/properties/environments/environment"; -export let properties: EnvProperties = { - environment: "beta", - dashboard: 'connect', +let props: EnvProperties = { isDashboard: true, - adminToolsPortalType: "community", enablePiwikTrack: false, useCache: false, - framesAPIURL: "https://beta.openaire.eu/stats3/", - claimsAPIURL: "https://beta.services.openaire.eu/claims/rest/claimsService/", - statisticsAPIURL: "https://beta.services.openaire.eu/stats-api/", - statisticsFrameAPIURL: "https://beta.openaire.eu/stats/", - statisticsFrameNewAPIURL: "https://stats.madgik.di.uoa.gr/stats-api/", - useNewStatistisTool: true, - searchAPIURLLAst: "https://beta.services.openaire.eu/search/v2/api/", - searchResourcesAPIURL: "https://beta.services.openaire.eu/search/v2/api/resources", - openCitationsAPIURL: "https://services.openaire.eu/opencitations/getCitations?id=", - csvAPIURL: "https://beta.services.openaire.eu/search/v2/api/reports", - searchCrossrefAPIURL: "https://api.crossref.org/works", - searchDataciteAPIURL: "https://api.datacite.org/works", - searchOrcidURL: "https://pub.orcid.org/", - orcidURL: "https://orcid.org/", - doiURL: "https://dx.doi.org/", - cordisURL: "http://cordis.europa.eu/projects/", - openDoarURL: "http://v2.sherpa.ac.uk/id/repository/", - r3DataURL: "http://service.re3data.org/repository/", - swhURL: "https://archive.softwareheritage.org/", - sherpaURL: "http://www.sherpa.ac.uk/romeo/search.php?issn=", - zenodo: "https://zenodo.org/", - zenodoCommunities: "https://zenodo.org/api/communities/", - openAccess: "https://www.openaire.eu/support/faq#article-id-234", - openAccessRepo: "https://www.openaire.eu/support/faq#article-id-310", - fp7Guidlines: "https://www.openaire.eu/open-access-in-fp7-seventh-research-framework-programme", - h2020Guidlines: "https://www.openaire.eu/oa-publications/h2020/open-access-in-horizon-2020", - ercGuidlines: "http://erc.europa.eu/sites/default/files/document/file/ERC_Open_Access_Guidelines-revised_2014.pdf", - helpdesk: "https://www.openaire.eu/support/helpdesk", - helpdeskEmail: "helpdesk@openaire.eu", - utilsService: "https://demo.openaire.eu/utils-service", - vocabulariesAPI: "https://beta.services.openaire.eu/provision/mvc/vocabularies/", - piwikBaseUrl: " https://analytics.openaire.eu/piwik.php?idsite=6", - registryUrl: 'https://beta.services.openaire.eu/uoa-user-management/api/registry/', - loginUrl: "https://beta.services.openaire.eu/login-service/openid_connect_login", - userInfoUrl: "https://beta.services.openaire.eu/login-service/userInfo", - logoutUrl: "https://beta.services.openaire.eu/login-service/openid_logout", - cookieDomain: ".openaire.eu", - feedbackmail: "feedback@openaire.eu", - feedbackmailForMissingEntities: "feedback@openaire.eu", - cacheUrl: "https://demo.openaire.eu/cache/get?url=", - deleteCacheUrl: 'https://demo.openaire.eu/cache/clear', - deleteBrowserCacheUrl: 'https://beta.services.openaire.eu/uoa-admin-tools/cache', - adminToolsAPIURL: "https://beta.services.openaire.eu/uoa-admin-tools/", - adminToolsCommunity: "openaire", - communityAPI: "https://beta.services.openaire.eu/openaire/community/", - miningBackendURL: "https://beta.services.openaire.eu/interactive-mining", - csvLimit: 2000, - pagingLimit: 20, - resultsPerPage: 10, - baseLink: "", - domain: "https://beta.admin.connect.openaire.eu/", - baseOpenaireLink: "https://beta.explore.openaire.eu", - searchLinkToPublication: "/search/publication?articleId=", - searchLinkToProject: "/search/project?projectId=", - searchLinkToDataProvider: "/search/dataprovider?datasourceId=", - searchLinkToDataset: "/search/dataset?datasetId=", - searchLinkToOrganization: "/search/organization?organizationId=", - searchLinkToPublications: "/search/find/publications", - searchLinkToDataProviders: "/search/find/dataproviders", - searchLinkToProjects: "/search/find/projects", - searchLinkToDatasets: "/search/find/datasets", - searchLinkToSoftware: "/search/find/software", - searchLinkToOrganizations: "/search/find/organizations", - searchLinkToCompatibleDataProviders: "/search/content-providers", - searchLinkToEntityRegistriesDataProviders: "/search/entity-registries", - searchLinkToJournals: "/search/journals", - searchLinkToAdvancedPublications: "/search/advanced/publications", - searchLinkToAdvancedProjects: "/search/advanced/projects", - searchLinkToAdvancedDatasets: "/search/advanced/datasets", - searchLinkToAdvancedSoftware: "/search/advanced/software", - searchLinkToAdvancedDataProviders: "/search/advanced/dataproviders", - searchLinkToAdvancedOrganizations: "/search/advanced/organizations", - lastIndexInformationLink: "https://beta.openaire.eu/aggregation-and-content-provision-workflows", - showLastIndexInformationLink: false, - widgetLink: "https://beta.openaire.eu/index.php?option=com_openaire&view=widget&format=raw&projectId=", - claimsInformationLink: "https://beta.openaire.eu/linking", - lastIndexUpdate: "2020-05-06", - indexInfoAPI: "https://beta.services.openaire.eu/openaire/info/", - admins: ["rcd@openaire.eu"], - adminPortalURL: "https://beta.admin.connect.openaire.eu", - errorLink: '/error', - connectPortalUrl: 'https://beta.connect.openaire.eu' + domain:'https://beta.admin.connect.openaire.eu' + }; + +export let properties: EnvProperties = { + ...common, ...commonBeta, ...props +} diff --git a/src/environments/environment.prod.ts b/src/environments/environment.prod.ts index d916388..aaa4c1f 100644 --- a/src/environments/environment.prod.ts +++ b/src/environments/environment.prod.ts @@ -1,92 +1,15 @@ import {EnvProperties} from '../app/openaireLibrary/utils/properties/env-properties'; +import {common, commonProd} from "../app/openaireLibrary/utils/properties/environments/environment"; + +let props: EnvProperties = { -export let properties: EnvProperties = { - environment:"production", - dashboard: 'connect', isDashboard: true, - adminToolsPortalType: "community", enablePiwikTrack: false, useCache: false, - framesAPIURL: "https://www.openaire.eu/stats3/", - claimsAPIURL: "https://services.openaire.eu/claims/rest/claimsService/", - statisticsAPIURL: "https://beta.services.openaire.eu/stats-api/", - statisticsFrameAPIURL:"https://www.openaire.eu/stats/", - statisticsFrameNewAPIURL: "http://marilyn.athenarc.gr:8080/stats-api/", - useNewStatistisTool:false, - searchAPIURLLAst: "https://services.openaire.eu/search/v2/api/", - searchResourcesAPIURL: "https://services.openaire.eu/search/v2/api/resources", - openCitationsAPIURL: "https://services.openaire.eu/opencitations/getCitations?id=", - csvAPIURL: "https://services.openaire.eu/search/v2/api/reports", - searchCrossrefAPIURL: "https://api.crossref.org/works", - searchDataciteAPIURL: "https://api.datacite.org/works", - searchOrcidURL: "https://pub.orcid.org/", - orcidURL: "https://orcid.org/", - doiURL: "https://dx.doi.org/", - cordisURL: "http://cordis.europa.eu/projects/", - openDoarURL: "http://v2.sherpa.ac.uk/id/repository/", - r3DataURL: "http://service.re3data.org/repository/", - swhURL: "https://archive.softwareheritage.org/", - sherpaURL: "http://www.sherpa.ac.uk/romeo/search.php?issn=", - zenodo: "https://zenodo.org/", - zenodoCommunities: "https://zenodo.org/api/communities/", - openAccess: "https://www.openaire.eu/support/faq#article-id-234", - openAccessRepo: "https://www.openaire.eu/support/faq#article-id-310", - fp7Guidlines: "https://www.openaire.eu/open-access-in-fp7-seventh-research-framework-programme", - h2020Guidlines: "https://www.openaire.eu/oa-publications/h2020/open-access-in-horizon-2020", - ercGuidlines: "http://erc.europa.eu/sites/default/files/document/file/ERC_Open_Access_Guidelines-revised_2014.pdf", - helpdesk: "https://www.openaire.eu/support/helpdesk", - helpdeskEmail: "helpdesk@openaire.eu", - utilsService: "https://explore.openaire.eu/utils-service", - vocabulariesAPI:"https://services.openaire.eu/provision/mvc/vocabularies/", - piwikBaseUrl:" https://analytics.openaire.eu/piwik.php?idsite=6", - loginUrl: "https://services.openaire.eu/login-service/openid_connect_login", - registryUrl: 'https://services.openaire.eu/uoa-user-management/api/registry/', - userInfoUrl: "https://services.openaire.eu/login-service/userInfo", - logoutUrl: "https://services.openaire.eu/login-service/openid_logout", - cookieDomain:".openaire.eu", - feedbackmail:"openaire.test@gmail.com", - feedbackmailForMissingEntities: "feedback@openaire.eu", - cacheUrl:"https://explore.openaire.eu/cache/get?url=", - deleteCacheUrl: 'https://explore.openaire.eu/cache/clear', - deleteBrowserCacheUrl: 'https://services.openaire.eu/uoa-admin-tools/cache', - adminToolsAPIURL:"https://services.openaire.eu/uoa-admin-tools/", - adminToolsCommunity:"openaire", - communityAPI: "https://services.openaire.eu/openaire/community/", - miningBackendURL: "https://beta.services.openaire.eu/interactive-mining", - csvLimit: 2000, - pagingLimit: 20, - resultsPerPage: 10, - baseLink: "", - domain: "https://admin.explore.openaire.eu/", - baseOpenaireLink: "https://explore.openaire.eu", - searchLinkToPublication: "/search/publication?articleId=", - searchLinkToProject: "/search/project?projectId=", - searchLinkToDataProvider: "/search/dataprovider?datasourceId=", - searchLinkToDataset: "/search/dataset?datasetId=", - searchLinkToOrganization: "/search/organization?organizationId=", - searchLinkToPublications: "/search/find/publications", - searchLinkToDataProviders: "/search/find/dataproviders", - searchLinkToProjects: "/search/find/projects", - searchLinkToDatasets: "/search/find/datasets", - searchLinkToSoftware: "/search/find/software", - searchLinkToOrganizations: "/search/find/organizations", - searchLinkToCompatibleDataProviders: "/search/content-providers", - searchLinkToEntityRegistriesDataProviders: "/search/entity-registries", - searchLinkToJournals: "/search/journals", - searchLinkToAdvancedPublications: "/search/advanced/publications", - searchLinkToAdvancedProjects: "/search/advanced/projects", - searchLinkToAdvancedDatasets: "/search/advanced/datasets", - searchLinkToAdvancedSoftware: "/search/advanced/software", - searchLinkToAdvancedDataProviders: "/search/advanced/dataproviders", - searchLinkToAdvancedOrganizations: "/search/advanced/organizations", - lastIndexInformationLink: "https://www.openaire.eu/aggregation-and-content-provision-workflows", - showLastIndexInformationLink: false, - widgetLink: "https://www.openaire.eu/index.php?option=com_openaire&view=widget&format=raw&projectId=", - claimsInformationLink: "https://www.openaire.eu/linking", - lastIndexUpdate: "2020-12-17", - indexInfoAPI: "https://services.openaire.eu/openaire/info/", - admins: ["rcd@openaire.eu"], - adminPortalURL: "https://admin.connect.openaire.eu", - errorLink: '/error', - connectPortalUrl: 'https://connect.openaire.eu' + domain:'https://admin.connect.openaire.eu', + }; + +export let properties: EnvProperties = { + ...common, ...commonProd, ...props +} diff --git a/src/environments/environment.ts b/src/environments/environment.ts index fa9ff2e..4e9ff41 100644 --- a/src/environments/environment.ts +++ b/src/environments/environment.ts @@ -4,94 +4,19 @@ // The list of which env maps to which file can be found in `.angular-cli.json`. import {EnvProperties} from '../app/openaireLibrary/utils/properties/env-properties'; +import {common, commonDev, commonProd} from "../app/openaireLibrary/utils/properties/environments/environment"; + +let props: EnvProperties = { -export let properties: EnvProperties = { - environment: 'development', - dashboard: 'connect', isDashboard: true, - adminToolsPortalType: "community", enablePiwikTrack: false, useCache: false, - framesAPIURL: 'https://beta.openaire.eu/stats3/', - claimsAPIURL: 'http://scoobydoo.di.uoa.gr:8080/dnet-claims-service-2.0.0-SNAPSHOT/rest/claimsService/', - statisticsAPIURL: 'https://beta.services.openaire.eu/stats-api/', - statisticsFrameAPIURL: 'https://beta.openaire.eu/stats/', - statisticsFrameNewAPIURL: "https://stats.madgik.di.uoa.gr/stats-api/", - useNewStatistisTool: true, - searchAPIURLLAst: 'https://beta.services.openaire.eu/search/v2/api/', - searchResourcesAPIURL: 'https://beta.services.openaire.eu/search/v2/api/resources', - openCitationsAPIURL: 'https://services.openaire.eu/opencitations/getCitations?id=', - csvAPIURL: 'http://rudie.di.uoa.gr:8080/dnet-functionality-services-2.0.0-SNAPSHOT/rest/v2/reports', - searchCrossrefAPIURL: 'https://api.crossref.org/works', - searchDataciteAPIURL: 'https://api.datacite.org/works', - searchOrcidURL: 'https://pub.orcid.org/', - orcidURL: 'https://orcid.org/', - doiURL: 'https://dx.doi.org/', - cordisURL: 'http://cordis.europa.eu/projects/', - openDoarURL: 'http://v2.sherpa.ac.uk/id/repository/', - r3DataURL: 'http://service.re3data.org/repository/', - swhURL: "https://archive.softwareheritage.org/", - sherpaURL: 'http://www.sherpa.ac.uk/romeo/search.php?issn=', - zenodo: 'https://zenodo.org/', - zenodoCommunities: 'https://zenodo.org/api/communities/', - openAccess: 'https://www.openaire.eu/support/faq#article-id-234', - openAccessRepo: 'https://www.openaire.eu/support/faq#article-id-310', - fp7Guidlines: 'https://www.openaire.eu/open-access-in-fp7-seventh-research-framework-programme', - h2020Guidlines: 'https://www.openaire.eu/oa-publications/h2020/open-access-in-horizon-2020', - ercGuidlines: 'http://erc.europa.eu/sites/default/files/document/file/ERC_Open_Access_Guidelines-revised_2014.pdf', - helpdesk: 'https://www.openaire.eu/support/helpdesk', - helpdeskEmail: 'helpdesk@openaire.eu', - utilsService: 'http://mpagasas.di.uoa.gr:8000', - vocabulariesAPI: 'https://beta.services.openaire.eu/provision/mvc/vocabularies/', - piwikBaseUrl: ' https://analytics.openaire.eu/piwik.php?idsite=6', - registryUrl: 'http://mpagasas.di.uoa.gr:8080/dnet-openaire-users-1.0.0-SNAPSHOT/api/registry/', - loginUrl: "http://mpagasas.di.uoa.gr:19080/login-service/openid_connect_login", - userInfoUrl: "http://mpagasas.di.uoa.gr:19080/login-service/userInfo", - logoutUrl: "http://mpagasas.di.uoa.gr:19080/login-service/openid_logout", - cookieDomain: '.di.uoa.gr', - feedbackmail: 'openaire.test@gmail.com', - feedbackmailForMissingEntities: 'feedback@openaire.eu', - cacheUrl: 'http://scoobydoo.di.uoa.gr:3000/get?url=', - // deleteCacheUrl: 'http://duffy.di.uoa.gr:3000/clear', - // deleteBrowserCacheUrl: 'http://duffy.di.uoa.gr:19280/uoa-admin-tools/cache', - adminToolsAPIURL: 'http://duffy.di.uoa.gr:19280/uoa-admin-tools/', - adminToolsCommunity: 'openaire', - communityAPI: 'https://dev-openaire.d4science.org/openaire/community/', - miningBackendURL: 'https://beta.services.openaire.eu/interactive-mining', - csvLimit: 2000, - pagingLimit: 20, - resultsPerPage: 10, - baseLink: "", + connectPortalUrl: 'http://scoobydoo.di.uoa.gr:4200', domain:'https://beta.admin.connect.openaire.eu', - baseOpenaireLink: 'https://beta.explore.openaire.eu', - searchLinkToPublication: '/search/publication?articleId=', - searchLinkToProject: '/search/project?projectId=', - searchLinkToDataProvider: '/search/dataprovider?datasourceId=', - searchLinkToDataset: '/search/dataset?datasetId=', - searchLinkToOrganization: '/search/organization?organizationId=', - searchLinkToPublications: '/search/find/publications', - searchLinkToDataProviders: '/search/find/dataproviders', - searchLinkToProjects: '/search/find/projects', - searchLinkToDatasets: '/search/find/datasets', - searchLinkToSoftware: '/search/find/software', - searchLinkToOrganizations: '/search/find/organizations', - searchLinkToCompatibleDataProviders: '/search/content-providers', - searchLinkToEntityRegistriesDataProviders: '/search/entity-registries', - searchLinkToJournals: '/search/journals', - searchLinkToAdvancedPublications: '/search/advanced/publications', - searchLinkToAdvancedProjects: '/search/advanced/projects', - searchLinkToAdvancedDatasets: '/search/advanced/datasets', - searchLinkToAdvancedSoftware: '/search/advanced/software', - searchLinkToAdvancedDataProviders: '/search/advanced/dataproviders', - searchLinkToAdvancedOrganizations: '/search/advanced/organizations', - lastIndexInformationLink: 'https://www.openaire.eu/aggregation-and-content-provision-workflows', - showLastIndexInformationLink: false, - widgetLink: 'https://beta.openaire.eu/index.php?option=com_openaire&view=widget&format=raw&projectId=', - claimsInformationLink: 'https://www.openaire.eu/linking-beta', - lastIndexUpdate: '2019-05-16', - indexInfoAPI: 'http://beta.services.openaire.eu/openaire/info/', - admins: ['kostis30fylloy@gmail.com'], - adminPortalURL: 'https://beta.admin.connect.openaire.eu', - errorLink: '/error', - connectPortalUrl: 'http://scoobydoo.di.uoa.gr:4200' + }; + +export let properties: EnvProperties = { + ...common, ...commonDev, ...props +} + From bc201a1ae85741101c57e30bc21802e327b9e801 Mon Sep 17 00:00:00 2001 From: "k.triantafyllou" Date: Fri, 3 Nov 2023 16:53:39 +0200 Subject: [PATCH 35/36] [develop | DONE | FIXED]: Fix sidebar in customization page. --- src/app/app.component.html | 4 +- src/app/app.component.ts | 5 + src/app/openaireLibrary | 2 +- src/app/pages/community-routing.module.ts | 2 +- .../customization.component.html | 230 +++++++++--------- src/assets/common-assets | 2 +- src/assets/openaire-theme | 2 +- 7 files changed, 127 insertions(+), 120 deletions(-) diff --git a/src/app/app.component.html b/src/app/app.component.html index b63493a..bc0d9a2 100644 --- a/src/app/app.component.html +++ b/src/app/app.component.html @@ -5,9 +5,9 @@ -
- +
diff --git a/src/app/app.component.ts b/src/app/app.component.ts index 399c9ba..93a6fa2 100644 --- a/src/app/app.component.ts +++ b/src/app/app.component.ts @@ -28,6 +28,7 @@ export class AppComponent implements OnInit { params: BehaviorSubject = new BehaviorSubject(null); data: BehaviorSubject = new BehaviorSubject(null); hasSidebar: boolean = false; + hasInternalSidebar: boolean = false; hasHeader: boolean = true; hasAdminMenu: boolean = false; isFrontPage: boolean = false; @@ -81,6 +82,10 @@ export class AppComponent implements OnInit { this.hasSidebar = hasSidebar; this.cdr.detectChanges(); })); + this.subscriptions.push(this.layoutService.hasInternalSidebar.subscribe(hasInternalSidebar => { + this.hasInternalSidebar = hasInternalSidebar; + this.cdr.detectChanges(); + })); this.subscriptions.push(this.layoutService.hasHeader.subscribe(hasHeader => { this.hasHeader = hasHeader; this.cdr.detectChanges(); diff --git a/src/app/openaireLibrary b/src/app/openaireLibrary index 3e656de..06a2ae1 160000 --- a/src/app/openaireLibrary +++ b/src/app/openaireLibrary @@ -1 +1 @@ -Subproject commit 3e656de39ca585a307b558e46c26de61afc35b96 +Subproject commit 06a2ae16ee5576fec34cc1afad614eff45dc715d diff --git a/src/app/pages/community-routing.module.ts b/src/app/pages/community-routing.module.ts index e4a67fc..c8fec18 100644 --- a/src/app/pages/community-routing.module.ts +++ b/src/app/pages/community-routing.module.ts @@ -31,7 +31,7 @@ import {ConnectRIGuard} from "../openaireLibrary/connect/communityGuard/connectR { path: 'customize-layout', loadChildren: () => import('./customization/customization.module').then(m => m.CustomizationModule), - data: {hasSidebar: true, hasHeader: false} + data: {hasInternalSidebar: true, hasHeader: false} }, { path: 'user-info', diff --git a/src/app/pages/customization/customization.component.html b/src/app/pages/customization/customization.component.html index 62831e6..58d1938 100644 --- a/src/app/pages/customization/customization.component.html +++ b/src/app/pages/customization/customization.component.html @@ -1,134 +1,135 @@ -
- -
-
-
- + +
+
+
+ +
-
-
-
-
-
-
Backgrounds
-
Note: Custom background style settings will override any identity settings that effect the - visualisation of a background. -
+
+
+
+
+
Backgrounds
+
Note: Custom background style settings will override any identity settings that effect the + visualisation of a background. +
-
Quick look +
Quick look + +
+ + +
+
+
+
+
Buttons
+
Note: Custom background style settings will override any identity settings that effect the + visualisation of a background. +
+ +
Quick look + +
+
-
-
-
-
-
Buttons
-
Note: Custom background style settings will override any identity settings that effect the - visualisation of a background. -
+
+
-
Quick look +
Identity
+
Note: Custom identity style settings will effect the visualisation of the whole gateway. That + includes buttons, links, tabs, backgrounds, etc.
- -
- -
-
-
- -
Identity
-
Note: Custom identity style settings will effect the visualisation of the whole gateway. That - includes buttons, links, tabs, backgrounds, etc.
- -
-
-
-
See a preview
-
-
-
-
-
-
-
- +
+
See a preview
+
+
+
+
+
+
+
+ +
+
Style has been changed.
+
Click to refresh the view.
-
Style has been changed.
-
Click to refresh the view.
-
- + +
@@ -136,6 +137,7 @@
+
diff --git a/src/assets/common-assets b/src/assets/common-assets index d1b2d5e..6bb1e61 160000 --- a/src/assets/common-assets +++ b/src/assets/common-assets @@ -1 +1 @@ -Subproject commit d1b2d5e585722751792d12645d17f820cd6a7860 +Subproject commit 6bb1e61b059bef1bff3bfb0611b0df46f7840426 diff --git a/src/assets/openaire-theme b/src/assets/openaire-theme index 2dadcf8..5e8c1ad 160000 --- a/src/assets/openaire-theme +++ b/src/assets/openaire-theme @@ -1 +1 @@ -Subproject commit 2dadcf85926bc0f11fff22ed94dc197ddd8587c6 +Subproject commit 5e8c1addb1ebfa508aac8cb9540a755940c95b79 From b4f01d1fd0c6c07d658d6a0d726bcd91a1db0dac Mon Sep 17 00:00:00 2001 From: "k.triantafyllou" Date: Fri, 3 Nov 2023 16:56:49 +0200 Subject: [PATCH 36/36] [develop | DONE]: Remove overflow auto from menu_section in customization --- src/app/pages/customization/customization.component.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/app/pages/customization/customization.component.html b/src/app/pages/customization/customization.component.html index 58d1938..3c3624b 100644 --- a/src/app/pages/customization/customization.component.html +++ b/src/app/pages/customization/customization.component.html @@ -12,7 +12,7 @@ {{menuSelected.name}}
-
+