From 353fe171261bbd9e367c911c7ad7c298eb5f1848 Mon Sep 17 00:00:00 2001 From: "k.triantafyllou" Date: Fri, 4 Aug 2023 10:56:49 +0300 Subject: [PATCH 01/19] 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 02/19] 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 03/19] 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 04/19] 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 05/19] 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 06/19] 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 07/19] 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 08/19] 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 09/19] 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 ef19492aad5d594273caf0694b8c356543c77f91 Mon Sep 17 00:00:00 2001 From: "k.triantafyllou" Date: Thu, 14 Sep 2023 21:47:48 +0300 Subject: [PATCH 10/19] 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 4076f96fb12f0f7edf4326cde299ff6de93257e0 Mon Sep 17 00:00:00 2001 From: "k.triantafyllou" Date: Fri, 6 Oct 2023 15:28:23 +0300 Subject: [PATCH 11/19] 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 e5a4472c6d6ef3e0f138c114bdbfa8add5cfee6b Mon Sep 17 00:00:00 2001 From: "k.triantafyllou" Date: Mon, 9 Oct 2023 17:14:43 +0300 Subject: [PATCH 12/19] 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 14/19] 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 15/19] 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 16/19] [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 17/19] [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 18/19] [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 19/19] [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