-
`,
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/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;
}
+
+
}
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 0589cc1..ecb8256 100644
--- a/src/app/pages/users/users-managers/users-managers.component.ts
+++ b/src/app/pages/users/users-managers/users-managers.component.ts
@@ -30,7 +30,6 @@ export class UsersManagersComponent implements OnInit {
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/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/assets/common-assets b/src/assets/common-assets
index d18e0a7..d1b2d5e 160000
--- a/src/assets/common-assets
+++ b/src/assets/common-assets
@@ -1 +1 @@
-Subproject commit d18e0a7e43e5ab74649481ecbf352ba49893c66f
+Subproject commit d1b2d5e585722751792d12645d17f820cd6a7860
diff --git a/src/assets/openaire-theme b/src/assets/openaire-theme
index ac458b5..2dadcf8 160000
--- a/src/assets/openaire-theme
+++ b/src/assets/openaire-theme
@@ -1 +1 @@
-Subproject commit ac458b5a6d156167d7b6c9005ef1f9cfac75d3ae
+Subproject commit 2dadcf85926bc0f11fff22ed94dc197ddd8587c6
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 {
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
}
}