diff --git a/src/app/pages/content-providers/add-content-providers.component.html b/src/app/pages/content-providers/add-content-providers.component.html index 5c064b6..fa96943 100644 --- a/src/app/pages/content-providers/add-content-providers.component.html +++ b/src/app/pages/content-providers/add-content-providers.component.html @@ -36,12 +36,21 @@
- + Add +
+ +
diff --git a/src/app/pages/content-providers/add-content-providers.component.ts b/src/app/pages/content-providers/add-content-providers.component.ts index 32f8584..b4a3f11 100644 --- a/src/app/pages/content-providers/add-content-providers.component.ts +++ b/src/app/pages/content-providers/add-content-providers.component.ts @@ -102,8 +102,8 @@ export class AddContentProvidersComponent implements OnInit { "
" } - public addContentProvider(contentProvider: SearchResult) { - this.subscriptions.push(this.manageCommunityContentProvidersService.addContentProvider(this.properties, this.community.communityId, contentProvider).subscribe( + public addContentProvider(contentProvider: SearchResult, content = true, deposit =false) { + this.subscriptions.push(this.manageCommunityContentProvidersService.addContentProvider(this.properties, this.community.communityId, contentProvider, content, deposit).subscribe( data => { this.communityContentProviders.push(data); this._clearCacheService.purgeBrowserCache(this.openAIREEntities.DATASOURCE+" added", this.community.communityId); @@ -120,7 +120,7 @@ export class AddContentProvidersComponent implements OnInit { public removeContentProvider(contentProvider) { let communityContentProvider = this.getCommunityContentProvider(contentProvider); - let contentProviderId: string = communityContentProvider['id']; + let contentProviderId: string = communityContentProvider['openaireId']; this.subscriptions.push(this.manageCommunityContentProvidersService.removeContentProvider(this.properties, this.community.communityId, contentProviderId).subscribe( data => { let index = this.communityContentProviders.indexOf(communityContentProvider); diff --git a/src/app/pages/content-providers/manage-content-providers.component.ts b/src/app/pages/content-providers/manage-content-providers.component.ts index df641dc..63c6cdf 100644 --- a/src/app/pages/content-providers/manage-content-providers.component.ts +++ b/src/app/pages/content-providers/manage-content-providers.component.ts @@ -23,7 +23,7 @@ import {ManageCommunityContentProvidersService} from "../../services/manageConte [communityContentProviders]="communityContentProviders" [loading]="showLoadingInRemove" [community]="community" (editCriteria)="openCriteria($event)" - (editDepositInfo)="openDeposit($event)" + (communityContentProvidersChanged)="communityContentProvidersChanged($event)"> @@ -31,10 +31,18 @@ import {ManageCommunityContentProvidersService} from "../../services/manageConte [community]="community" (communityContentProvidersChanged)="communityContentProvidersChanged($event)"> -
- + +
+ + +
+
+
No Filters for {{dataProvider.officialname}} yet
@@ -45,17 +53,6 @@ import {ManageCommunityContentProvidersService} from "../../services/manageConte
- -
-
-
- - - -
- ` }) @@ -75,6 +72,7 @@ export class ManageContentProvidersComponent implements OnInit { public dataProvider: ContentProvider; message = ""; deposit= false; + enabled = false; constructor(private title: Title, private cdr: ChangeDetectorRef, @@ -111,27 +109,22 @@ export class ManageContentProvidersComponent implements OnInit { public openCriteria(contentProvider: ContentProvider) { this.dataProvider = contentProvider; - this.filtersModal.title = 'Filters'; + this.deposit = this.dataProvider.deposit; + this.message = this.dataProvider.message; + this.enabled = this.dataProvider.enabled; + this.filtersModal.title = 'Edit datasource Options'; this.filtersModal.okButtonText = "Save"; this.filtersModal.back = true; this.filtersModal.okButton = true; this.filtersModal.open(); this.cdr.detectChanges(); } - public openDeposit(contentProvider: ContentProvider) { - this.dataProvider = contentProvider; - this.deposit = this.dataProvider.deposit; - this.message = this.dataProvider.message; - this.depositModal.title = 'Deposit info'; - this.depositModal.okButtonText = "Save"; - this.depositModal.back = true; - this.depositModal.okButton = true; - this.depositModal.open(); - this.cdr.detectChanges(); - } public saveCriteria() { let callback = (selectionCriteria): void => { this.dataProvider.selectioncriteria = selectionCriteria; + this.dataProvider.deposit = this.deposit; + this.dataProvider.message = this.message; + this.dataProvider.enabled = this.enabled; this.manageCommunityContentProvidersService.saveContentProvider(this.properties, this.dataProvider).subscribe(() => { this.criteria.reset(); this.removeContentProvidersComponent.getCommunityContentProviders(); @@ -154,20 +147,10 @@ export class ManageContentProvidersComponent implements OnInit { } } - saveDepositInfo(){ - this.dataProvider.deposit = this.deposit; - this.dataProvider.message = this.message; - console.log(this.message) - this.manageCommunityContentProvidersService.saveContentProvider(this.properties, this.dataProvider).subscribe(() => { - this.removeContentProvidersComponent.getCommunityContentProviders(); - NotificationHandler.rise('Deposit info have been successfully updated'); - }, error => { - this.criteria.handeError('An error has been occurred. Try again later!', error); - }); - } depositReset(){ this.message = this.dataProvider.message; this.deposit = this.dataProvider.deposit; + this.enabled = this.dataProvider.enabled; } } diff --git a/src/app/pages/content-providers/remove-content-providers.component.html b/src/app/pages/content-providers/remove-content-providers.component.html index d57f687..355793b 100644 --- a/src/app/pages/content-providers/remove-content-providers.component.html +++ b/src/app/pages/content-providers/remove-content-providers.component.html @@ -54,8 +54,11 @@ [no title available] -
Deposit
-
{{item.message}}
+
Content source
+
Suggested for deposit
+
+ Deposit info: + {{item.message}}
Filters
@@ -67,33 +70,23 @@
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 252f1f6..e71b328 100644 --- a/src/app/pages/content-providers/remove-content-providers.component.ts +++ b/src/app/pages/content-providers/remove-content-providers.component.ts @@ -49,8 +49,7 @@ export class RemoveContentProvidersComponent implements OnInit { public keyword: string = ''; @Output() addContentProviders: EventEmitter = new EventEmitter(); @Output() editCriteria: EventEmitter = new EventEmitter(); - @Output() editDepositInfo: EventEmitter = new EventEmitter(); - + constructor(private route: ActivatedRoute, private _router: Router, private _fb: UntypedFormBuilder, private _manageCommunityContentProvidersService: ManageCommunityContentProvidersService, @@ -184,7 +183,5 @@ export class RemoveContentProvidersComponent implements OnInit { openCriteria(contentProvider: ContentProvider) { this.editCriteria.emit(contentProvider); } - openDeposit(contentProvider: ContentProvider) { - this.editDepositInfo.emit(contentProvider); - } + } diff --git a/src/app/services/manageContentProviders.service.ts b/src/app/services/manageContentProviders.service.ts index 9f1d752..e938653 100644 --- a/src/app/services/manageContentProviders.service.ts +++ b/src/app/services/manageContentProviders.service.ts @@ -15,9 +15,9 @@ export class ManageCommunityContentProvidersService { return this.http.request('delete', url, {body: id, headers: headers}); } - addContentProvider(properties: EnvProperties, pid: string, contentProvider: any): Observable { + addContentProvider(properties: EnvProperties, pid: string, contentProvider: any, content:boolean, deposit:boolean): Observable { let url = properties.communityAPI + pid + '/datasources'; - let communityContentProvider = this.convertSearchContentProviderToCommunityContentProvider(contentProvider, pid); + let communityContentProvider = this.convertSearchContentProviderToCommunityContentProvider(contentProvider, pid, content, deposit); return this.http.post(url, communityContentProvider); } @@ -26,12 +26,14 @@ export class ManageCommunityContentProvidersService { return this.http.post(url, contentProvider); } - convertSearchContentProviderToCommunityContentProvider(contentProvider: any, community: string): ContentProvider { + convertSearchContentProviderToCommunityContentProvider(contentProvider: any, community: string, content:boolean, deposit:boolean): ContentProvider { let communityContentProvider: ContentProvider = new ContentProvider(); communityContentProvider.communityId = community; communityContentProvider.officialname = contentProvider.title.name; communityContentProvider.name = contentProvider.englishname; communityContentProvider.openaireId = contentProvider.id; + communityContentProvider.enabled = content; + communityContentProvider.deposit = deposit; return communityContentProvider; }