From 4a471265c586cc6b06bd65d8eb1deb2c74273e09 Mon Sep 17 00:00:00 2001 From: "k.triantafyllou" Date: Mon, 22 Sep 2025 15:52:54 +0300 Subject: [PATCH] [develop | CHANGED | DONE]: Revised all pages with select subcommunity and move select all into a dropdown. --- src/app/openaireLibrary | 2 +- .../advanced-criteria.component.ts | 163 ++-- .../advanced-criteria.module.ts | 3 +- .../subcommunity-selection.component.ts | 10 +- .../add-content-providers.component.html | 172 ++-- .../remove-content-providers.component.html | 438 ++++++----- .../remove-content-providers.component.ts | 2 +- .../projects/add-projects.component.html | 296 +++---- .../projects/remove-projects.component.html | 547 ++++++------- .../projects/remove-projects.component.ts | 2 + .../subjects-edit-form.component.html | 735 +++++++++--------- .../subjects-edit-form.component.ts | 3 + .../add-zenodo-communities.component.html | 18 +- .../add-zenodo-communities.component.ts | 3 + .../zenodo-communities.component.html | 258 +++--- .../zenodo-communities.component.ts | 3 + 16 files changed, 1405 insertions(+), 1250 deletions(-) diff --git a/src/app/openaireLibrary b/src/app/openaireLibrary index e953580..66d71ee 160000 --- a/src/app/openaireLibrary +++ b/src/app/openaireLibrary @@ -1 +1 @@ -Subproject commit e95358058662e1a1f669a1ff6a7c67c32e2b4514 +Subproject commit 66d71ee3e233c14d25f8088b13d55e535df9f5dc diff --git a/src/app/pages/advanced-criteria/advanced-criteria.component.ts b/src/app/pages/advanced-criteria/advanced-criteria.component.ts index 767869c..49e4e44 100644 --- a/src/app/pages/advanced-criteria/advanced-criteria.component.ts +++ b/src/app/pages/advanced-criteria/advanced-criteria.component.ts @@ -12,91 +12,102 @@ import {CriteriaUtils} from "../content-providers/criteria-utils"; import {CommunityInfo} from "../../openaireLibrary/connect/community/communityInfo"; import {ActivatedRoute, Router} from "@angular/router"; import {Title} from "@angular/platform-browser"; +import {OpenaireEntities} from "../../openaireLibrary/utils/properties/searchFields"; @Component({ selector: 'advanced-criteria', template: ` -
-
-
- -
-
- -
- - - - -
-
-
- -
- - -
- -
-
-
Criteria
-
-
-
-
No criteria yet
- - Add multiple constraints in AND to define a criterion: results that satisfy at least one of the - criteria will be included in your community. - -
-
-
-
-
-
- - {{ communityService.getCommunityLabel(subcommunity.subCommunityId) }} -
Criteria
-
+
+
+
+
+
+ +
+
+
+
+ + +
+
+
-
-
- +
+
+ +
+ + + + +
+
+
+
Criteria
+
+
+
+
No criteria yet
+ + Add multiple constraints in AND to define a criterion: results that satisfy at least + one of the + criteria will be included in your community. + +
+
+
+ +
+
+ +
-
- -
-
No Criteria yet
- - Add multiple constraints in AND to define a criterion: results that satisfy at least one of the criteria - will be included in your community. - -
- -
+
+ +
+
No Criteria yet
+ + Add multiple constraints in AND to define a criterion: results that satisfy at least one + of the criteria + will be included in your community. + +
+ +
` }) @@ -192,4 +203,6 @@ export class AdvancedCriteriaComponent implements OnInit, OnDestroy { }); this.subCommunityChanged(); } + + protected readonly openAIREEntities = OpenaireEntities; } diff --git a/src/app/pages/advanced-criteria/advanced-criteria.module.ts b/src/app/pages/advanced-criteria/advanced-criteria.module.ts index 034d2a8..ac28f51 100644 --- a/src/app/pages/advanced-criteria/advanced-criteria.module.ts +++ b/src/app/pages/advanced-criteria/advanced-criteria.module.ts @@ -8,11 +8,12 @@ import {CriteriaModule} from "../content-providers/criteria/criteria.module"; import {IconsModule} from "../../openaireLibrary/utils/icons/icons.module"; import {LoadingModule} from "../../openaireLibrary/utils/loading/loading.module"; import {SelectSubCommunityModule} from "../content-config/subcommunity-selection/subcommunity-selection.module"; +import {SearchInputModule} from "../../openaireLibrary/sharedComponents/search-input/search-input.module"; @NgModule({ imports: [CommonModule, RouterModule.forChild([ {path: '', component: AdvancedCriteriaComponent,} - ]), PageContentModule, FullScreenModalModule, CriteriaModule, IconsModule, LoadingModule, SelectSubCommunityModule], + ]), PageContentModule, FullScreenModalModule, CriteriaModule, IconsModule, LoadingModule, SelectSubCommunityModule, SearchInputModule], declarations: [AdvancedCriteriaComponent], exports: [AdvancedCriteriaComponent] }) diff --git a/src/app/pages/content-config/subcommunity-selection/subcommunity-selection.component.ts b/src/app/pages/content-config/subcommunity-selection/subcommunity-selection.component.ts index 5acd47a..88c2205 100644 --- a/src/app/pages/content-config/subcommunity-selection/subcommunity-selection.component.ts +++ b/src/app/pages/content-config/subcommunity-selection/subcommunity-selection.component.ts @@ -7,16 +7,14 @@ import {ActivatedRoute, Router} from "@angular/router"; selector: 'select-sub-community', template: ` - -
+
Configuration for {{this.communityService.selectedSubCommunityId() ? ' subcommunity: ' :' community'}}
-
@@ -31,7 +29,7 @@ export class SelectSubCommunityComponent { subCommunities = null control - constructor(private communityService: CommunityService, private route: ActivatedRoute, private router: Router) { + constructor(protected communityService: CommunityService, private route: ActivatedRoute, private router: Router) { } ngOnInit() { @@ -69,4 +67,4 @@ export class SelectSubCommunityComponent { } -} \ No newline at end of file +} 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 50845c6..84df1f0 100644 --- a/src/app/pages/content-providers/add-content-providers.component.html +++ b/src/app/pages/content-providers/add-content-providers.component.html @@ -1,81 +1,97 @@ -
- -
-
-
- -
-
-
-
-
-
-
- -
-
-
-
No {{openAIREEntities.DATASOURCES}} found
-
-
- - - -
-
-
-
- - -
-
-
- - -
-
-
+
+
+
+
-
-
- +
+
+ +
+
+
+
+
+
+
+
+
+ +
+
+
+
No {{ openAIREEntities.DATASOURCES }} + found +
+
+
+ + - -
- -
-
+ +
+
+
+
+ + +
+
+
+ + +
+
+
+
+
+
+ + +
+ +
+
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 b03ae5c..c5f65a3 100644 --- a/src/app/pages/content-providers/remove-content-providers.component.html +++ b/src/app/pages/content-providers/remove-content-providers.component.html @@ -1,226 +1,246 @@
-
-
-
- -
-
- -
-
-
-
-
-
-
- -
-
- - - - - -
- -
-
-
No {{openAIREEntities.DATASOURCES}} - for {{community.shortTitle}} - {{' | ' + this.communityService.selectedSubCommunity['category'] + '| ' + this.communityService.selectedSubCommunity?.label}} - found -
-
-
- - -
-
-
-
-
- - {{item.officialname}} - {{item.name}} - [no title available] - - - {{item.officialname}} - {{item.name}} - [no title available] - -
-
Content source -
-
Suggested for - deposit -
-
-
Deposit info:
-
-
-
-
Filters
-
-
- View - all {{item.selectioncriteria.criteria.length}} filters +
+
+
+
+ +
+
+
+
+
+
-
-
-
-
+
+
+
+
+
+
+
+ +
+
+ + + + + +
+
+
+
No {{ openAIREEntities.DATASOURCES }} + for {{ community.shortTitle }} + {{ ' | ' + this.communityService.selectedSubCommunity['category'] + '| ' + this.communityService.selectedSubCommunity?.label }} + found +
-
-
- - - - +
+ + +
+
+
+
+
+ + {{ item.officialname }} + {{ item.name }} + [no title available] + + + {{ item.officialname }} + {{ item.name }} + [no title available] + +
+
+ Content source +
+
Suggested for + deposit +
+
+
Deposit info:
+
+
+
+
Filters
+
+
+ View + all {{ item.selectioncriteria.criteria.length }} filters +
+
+
+
+
+
+
+ +
+ +
+
+
+
+
+
+ + +
- -
-
-
-
-
- - -
-
-
- -
-
-
-
-
- - {{item.officialname}} - {{item.name}} - [no title available] - - - {{item.officialname}} - {{item.name}} + +
+
+
+
+
+ + {{ item.officialname }} + {{ item.name }} + [no title available] + + + {{ item.officialname }} + {{ item.name }} [no title available] -
- - - {{communityService.getCommunityLabel(item.communityId)}} -
- Content source +
+ + + {{ communityService.getCommunityLabel(item.communityId) }} +
+ Content source +
+
+ Suggested for deposit +
+
+
Deposit info:
+
+
+
+
Filters
+
+
+ View + all {{ item.selectioncriteria.criteria.length }} filters +
+
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+
+
-
Suggested for deposit -
-
-
Deposit info:
-
-
-
-
Filters
-
-
- View - all {{item.selectioncriteria.criteria.length}} filters -
-
-
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-
-
-
-
+
-
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 f6208ce..b672b05 100644 --- a/src/app/pages/content-providers/remove-content-providers.component.ts +++ b/src/app/pages/content-providers/remove-content-providers.component.ts @@ -55,7 +55,7 @@ export class RemoveContentProvidersComponent implements OnInit { constructor(private route: ActivatedRoute, private _router: Router, private _fb: UntypedFormBuilder, - private communityService: CommunityService, + protected communityService: CommunityService, private _manageCommunityContentProvidersService: ManageCommunityContentProvidersService, private _searchCommunityContentProvidersService: SearchCommunityDataprovidersService, private _clearCacheService: ClearCacheService) { diff --git a/src/app/pages/projects/add-projects.component.html b/src/app/pages/projects/add-projects.component.html index f1a2448..d128d57 100644 --- a/src/app/pages/projects/add-projects.component.html +++ b/src/app/pages/projects/add-projects.component.html @@ -1,155 +1,183 @@ -

-
-
-
-
    -
  • +

    +
    +
    +
    +
      +
    • - {{selectedFunder.name}} + {{ selectedFunder.name }} - -
      • -
    +

    • +
+
+ + +
- - -

-
- + - -
-
-

Filters

- - Clear All - -
- - - - -
- No filters available - Filters temporarily unavailable. Please try again later. -
-
    -
  • - - -
    • -
-
- -
- -
-
-
- -
-
-
-
-
- -
-
-
- -
-
-
- -
-
-
- + +
+
+

Filters

+ + Clear All +
-
-
-
No {{openaireEntities.PROJECTS | lowercase}} found
-
-
- -
- - -
+ + + + +
+ No filters available + Filters temporarily unavailable. Please try again later. +
+
    +
  • + + +
    • +
+
+ +
+
+
+ +
+
+
+
+ +
+
+
+
- - -
-
-
-
- - -
-
-
-
- -
- +
+
+
+
+ +
+
+
+ +
+
+
+ +
+
+
+
No {{ openaireEntities.PROJECTS | lowercase }} found
+
+
+ + +
+ + + +
+
+ + +
+
+
+ +
+
+
+
+ + +
+
+
+
+ +
+
+
+ + + Add - + +
+
+ +
+
+
+
-
-
-
- - - Remove - +
+ +
-
-
-
+
-
-
- - -
- -
-
+
-
diff --git a/src/app/pages/projects/remove-projects.component.html b/src/app/pages/projects/remove-projects.component.html index 3d229de..8e1ae17 100644 --- a/src/app/pages/projects/remove-projects.component.html +++ b/src/app/pages/projects/remove-projects.component.html @@ -1,277 +1,302 @@
-
-
-
- -
-
-
- -
-
-
-
-
-
- -
- - -
-
-
-
- -
Funder
- - -
-
-
-
-
- - -
- -
-
- -
- - - - -
- -
-
-
-
No {{openaireEntiites.PROJECTS | lowercase}} - for {{community.shortTitle}} - {{' | ' + this.communityService.selectedSubCommunity['category'] + '| ' + this.communityService.selectedSubCommunity?.label}} - found -
-
-
- -
- -
- - -
-
-
-
-
-
- - {{item.name}} - ({{item.acronym}}) - [no title available] - - - {{item.name}} - ({{item.acronym}}) - [no title available] - -
-
-
- Grant ID: - {{item.grantId}} -
-
- Funder: - {{item.funder}} -
-
-
-
-
-
- -
-
-
- + [disabled]="loading" [class.uk-disabled]="loading"> + + Add +
-
-
-
-
- - +
+
+
+
+
+ +
Funder
+ +
-
-
- -
-
- -
-
-
-
-
-
- - {{item.name}} - ({{item.acronym}}) - [no title available] - - - {{item.name}} - ({{item.acronym}}) +
+
+
+
+ + +
+ +
+
+ +
+ + + + +
+
+
+
+
No {{ openaireEntiites.PROJECTS | lowercase }} + for {{ community.shortTitle }} + {{ ' | ' + this.communityService.selectedSubCommunity['category'] + '| ' + this.communityService.selectedSubCommunity?.label }} + found +
+
+ + +
+ + + +
+
+ + +
+
+
+ + +
+
+
+
+
+ + {{ item.name }} + ({{ item.acronym }}) + [no title available] + + + {{ item.name }} + ({{ item.acronym }}) [no title available] -
- - {{communityService.getCommunityLabel(item.communityId)}} - -
-
- Grant ID: - {{item.grantId}} -
-
- Funder: - {{item.funder}} -
+ +
+
+ Grant ID: + {{ item.grantId }} +
+
+ Funder: + {{ item.funder }} +
+
+
+
+
+
+ +
+
+
+ +
+
+
+
+
+
+
+
+ + +
+
+
+ +
+
+ +
+
+
+
+
+
+ + {{ item.name }} + ({{ item.acronym }}) + [no title available] + + + {{ item.name }} + ({{ item.acronym }}) + [no title available] + +
+ + {{ communityService.getCommunityLabel(item.communityId) }} + +
+
+ Grant ID: + {{ item.grantId }} +
+
+ Funder: + {{ item.funder }} +
+
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+
+
-
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-
+
-
-
-
-
diff --git a/src/app/pages/projects/remove-projects.component.ts b/src/app/pages/projects/remove-projects.component.ts index 3d4bafc..6914b32 100644 --- a/src/app/pages/projects/remove-projects.component.ts +++ b/src/app/pages/projects/remove-projects.component.ts @@ -357,4 +357,6 @@ export class RemoveProjectsComponent implements OnInit { }); this.subCommunityChanged(); } + + protected readonly openAIREEntities = OpenaireEntities; } diff --git a/src/app/pages/subjects/subjects-edit-form/subjects-edit-form.component.html b/src/app/pages/subjects/subjects-edit-form/subjects-edit-form.component.html index dbd95ea..cf748ba 100644 --- a/src/app/pages/subjects/subjects-edit-form/subjects-edit-form.component.html +++ b/src/app/pages/subjects/subjects-edit-form/subjects-edit-form.component.html @@ -1,392 +1,421 @@
-
-
-
-
+
+
+
+
+ +
+
+
+
+
+
+
+
-
-
-
-
- -
-
-
- -
- -
-
- -
    -
  • +
    +
    +
    + +
    + +
    - -
    - -
    -
    -
    -
    {{ item.group }}
    -
    + +
      +
    • +
      + +
      + +
      +
      +
      +
      {{ item.group }}
      +
      + [attr.uk-tooltip]="subItem.length > maxCharacters ? 'cls: uk-active' : 'cls: uk-invisible'" + [title]="subItem"> {{ subItem.length > maxCharacters ? subItem.substring(0, maxCharacters) + '...' : subItem }} -
      - -
      -
      -
      - -
      -
      -
      -
      {{ groupedAllSubjects[indexAll].group }}
      - -
      +
      + +
      +
      +
      + +
      +
      +
      +
      {{ groupedAllSubjects[indexAll].group }}
      + +
      - {{ subItem.length > maxCharacters ? subItem.substring(0, maxCharacters) + '...' : subItem }} - -
      -       - -
      -
      -
      - + {{ subItem.length > maxCharacters ? subItem.substring(0, maxCharacters) + '...' : subItem }} + +
      + + +
      +
      +
      + {{ subItem.length > maxCharacters ? subItem.substring(0, maxCharacters) + '...' : subItem }} +
      +
      +
      +       +
      +
      -
      -
      - -
    -
    -
    - -
    -
    There are no subjects yet
    -
    -     -
    • -
  • -
    - -
    - -
    - -
    - -
    -
    -
    -
    {{ item.group }}
    -
    + +
    +
    There are no subjects yet
    +
    +     +
    • +
  • +
    + +
    + +
    + +
    + +
    +
    +
    +
    {{ item.group }}
    +
    + [attr.uk-tooltip]="subItem.length > maxCharacters ? 'cls: uk-active' : 'cls: uk-invisible'" + [title]="subItem"> {{ subItem.length > maxCharacters ? subItem.substring(0, maxCharacters) + '...' : subItem }} -
    - -
    -
    -
    - -
    -
    -
    -
    {{ groupedSubjects[indexSubjects]?.group }}
    - -
    +
    + +
    +
    +
    + +
    +
    +
    +
    {{ groupedSubjects[indexSubjects]?.group }}
    + +
    - {{ subItem.length > maxCharacters ? subItem.substring(0, maxCharacters) + '...' : subItem }} - -
    -     - -
    -
    -
    - + {{ subItem.length > maxCharacters ? subItem.substring(0, maxCharacters) + '...' : subItem }} + +
    + + +
    +
    +
    + {{ subItem.length > maxCharacters ? subItem.substring(0, maxCharacters) + '...' : subItem }} +
    +
    +
    +     +
    +
    +
    + + +
    +
    There are no subjects yet
    +
    +     +
    • +
  • +
    +
    -
-
- -
-
-
- - -
-
There are no subjects yet
-
- - -
  • -
    - -
    - -
    - -
    - -
    -
    -
    -
    {{ item.group }}
    -
    + +
    + +
    + +
    +
    +
    +
    {{ item.group }}
    +
    + [attr.uk-tooltip]="subItem.length > maxCharacters ? 'cls: uk-active' : 'cls: uk-invisible'" + [title]="subItem"> {{ subItem.length > maxCharacters ? subItem.substring(0, maxCharacters) + '...' : subItem }} -
    - -
    -
    -
    - -
    -
    -
    -
    {{ groupedSdg[indexSdg].group }}
    - -
    +
    + +
    +
    +
    + +
    +
    +
    +
    {{ groupedSdg[indexSdg].group }}
    + +
    - {{ subItem.length > maxCharacters ? subItem.substring(0, maxCharacters) + '...' : subItem }} - -
    -     - -
    -
    -
    - + {{ subItem.length > maxCharacters ? subItem.substring(0, maxCharacters) + '...' : subItem }} + +
    + + +
    +
    +
    + {{ subItem.length > maxCharacters ? subItem.substring(0, maxCharacters) + '...' : subItem }} -
    -
    -
    -     -
    -
    -
    - +
    +
    +
    + +
    +
    +
    +     - -
    -
    There are no subjects yet
    -
    -     -
    • -
  • -
    - -
    - -
    - -
    - -
    -
    -
    -
    {{ item.group }}
    -
    + +
    +
    There are no subjects yet
    +
    +     +
    • +
  • +
    + +
    + +
    + +
    + +
    +
    +
    +
    {{ item.group }}
    +
    + [attr.uk-tooltip]="subItem.length > maxCharacters ? 'cls: uk-active' : 'cls: uk-invisible'" + [title]="subItem"> {{ subItem.length > maxCharacters ? subItem.substring(0, maxCharacters) + '...' : subItem }} -
    - -
    -
    -
    - -
    -
    -
    -
    {{ groupedFos[indexFos].group }}
    - -
    +
    + +
    +
    +
    + +
    +
    +
    +
    {{ groupedFos[indexFos].group }}
    + +
    - {{ subItem.length > maxCharacters ? subItem.substring(0, maxCharacters) + '...' : subItem }} - -
    -     - -
    -
    -
    - + {{ subItem.length > maxCharacters ? subItem.substring(0, maxCharacters) + '...' : subItem }} + +
    + + +
    +
    +
    + {{ subItem.length > maxCharacters ? subItem.substring(0, maxCharacters) + '...' : subItem }} +
    +
    +
    +     +
    +
    +
    + + +
    +
    There are no subjects yet
    +
    +     +
    • +
  • +
    +
    +
    + + {{ _communityService.getCommunityLabel(subcommunity.subCommunityId) }} +
    +
    Free text ({{ subcommunity.subjects.length }} + ): + {{ subject }} + {{ isLast ? (i == subcommunity.subjects.length - 1 ? '' : '...') : ',' }} +
    +
    SDGs ({{ subcommunity.sdg.length }}): + {{ subject }} + {{ isLast ? (i == subcommunity.sdg.length - 1 ? '' : '...') : ',' }} +
    +
    Fields of Science ({{ subcommunity.fos.length }} + ): + {{ subject }} + {{ isLast ? (i == subcommunity.fos.length - 1 ? '' : '...') : ',' }} +
    +
    +
    +
    -
    • -
    - -
    -
    + +
    - - -
    -
    There are no subjects yet
    -
    -     - -
  • -
    -
    -
    - - {{ _communityService.getCommunityLabel(subcommunity.subCommunityId) }} -
    -
    Free text ({{ subcommunity.subjects.length }}): - {{ subject }} - {{ isLast ? (i == subcommunity.subjects.length -1?'':'...') : ',' }}
    -
    SDGs ({{ subcommunity.sdg.length }}): - {{ subject }} - {{ isLast ? (i == subcommunity.sdg.length -1?'':'...') : ',' }}
    -
    Fields of Science ({{ subcommunity.fos.length }}): - {{ subject }} - {{ isLast ? (i == subcommunity.fos.length -1?'':'...') : ',' }}
    -
    -
    -
    -
    -
    • - +
    -
    -
    -
    -
    -
    -
    - -
    -
    Separate subjects with commas
    -
    -
    +
    +
    +
    +
    + +
    +
    Separate subjects with commas
    +
    +
    {{ subject }} @@ -394,19 +423,19 @@ -
    -
    -
    - -
    -
    -
    +
    +
    +
    + +
    +
    +
    {{ subject }} -
    - +
    + +
    -
    diff --git a/src/app/pages/subjects/subjects-edit-form/subjects-edit-form.component.ts b/src/app/pages/subjects/subjects-edit-form/subjects-edit-form.component.ts index d03d92c..c60a1d4 100644 --- a/src/app/pages/subjects/subjects-edit-form/subjects-edit-form.component.ts +++ b/src/app/pages/subjects/subjects-edit-form/subjects-edit-form.component.ts @@ -19,6 +19,7 @@ import {ClearCacheService} from "../../../openaireLibrary/services/clear-cache.s import {SdgSelectionComponent} from '../../../openaireLibrary/sdg/sdg-selection/sdg-selection.component'; import {FosSelectionComponent} from '../../../openaireLibrary/fos/fos-selection/fos-selection.component'; import {InputComponent} from "../../../openaireLibrary/sharedComponents/input/input.component"; +import {OpenaireEntities} from "../../../openaireLibrary/utils/properties/searchFields"; declare var UIkit: any; @@ -435,4 +436,6 @@ export class SubjectsEditFormComponent implements OnInit { }); this.subCommunityChanged(); } + + protected readonly openAIREEntities = OpenaireEntities; } diff --git a/src/app/pages/zenodo-communities/add-zenodo-communities.component.html b/src/app/pages/zenodo-communities/add-zenodo-communities.component.html index a7a1b57..e6a4df2 100644 --- a/src/app/pages/zenodo-communities/add-zenodo-communities.component.html +++ b/src/app/pages/zenodo-communities/add-zenodo-communities.component.html @@ -1,9 +1,15 @@ -
    - -
    -
    -
    +
    +
    +
    + +
    +
    +
    +
    +
    +
    +
    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 7f5686f..e290e0d 100644 --- a/src/app/pages/zenodo-communities/add-zenodo-communities.component.ts +++ b/src/app/pages/zenodo-communities/add-zenodo-communities.component.ts @@ -13,6 +13,7 @@ import {CommunityInfo} from "../../openaireLibrary/connect/community/communityIn import {HelperFunctions} from "../../openaireLibrary/utils/HelperFunctions.class"; import {CommunityService} from "../../openaireLibrary/connect/community/community.service"; import {NotificationHandler} from "../../openaireLibrary/utils/notification-handler"; +import {OpenaireEntities} from "../../openaireLibrary/utils/properties/searchFields"; declare var UIkit; @@ -229,4 +230,6 @@ export class AddZenodoCommunitiesComponent implements OnInit { pos: 'bottom-right' }); } + + protected readonly openaireEntities = OpenaireEntities; } diff --git a/src/app/pages/zenodo-communities/zenodo-communities.component.html b/src/app/pages/zenodo-communities/zenodo-communities.component.html index 56013ed..755e2a7 100644 --- a/src/app/pages/zenodo-communities/zenodo-communities.component.html +++ b/src/app/pages/zenodo-communities/zenodo-communities.component.html @@ -1,143 +1,151 @@
    - - -
    -
    -
    - -
    -
    -
    -
    - -
    -
    -
    -
    -
    - -
    - -
    -
    - - - -
    -
    -
    -
    No zenodo communities - for {{ community.shortTitle }} - {{' | ' + this._communityService.selectedSubCommunity['category'] + '| ' + this._communityService.selectedSubCommunity?.label}} - found -
    -
    - -
    - - - -
    -
    -
    -
    - -
    -
    -
    -
    -
    - -
    +
    +
    +
    +
    +
    +
    +
    +
    + +
    + +
    +
    + + + +
    +
    +
    +
    No zenodo communities + for {{ community.shortTitle }} + {{ ' | ' + this._communityService.selectedSubCommunity['category'] + '| ' + this._communityService.selectedSubCommunity?.label }} + found +
    -
    -
    - - - Remove as Main - -
    +
    + + + +
    +
    +
    +
    + +
    +
    +
    +
    +
    + +
    +
    + + + +
    +
    +
    +
    +
    + +
    + + +
    +
    +
    +
    -
    -
    - -
    - - -
    -
    -
    -
    -
    - + diff --git a/src/app/pages/zenodo-communities/zenodo-communities.component.ts b/src/app/pages/zenodo-communities/zenodo-communities.component.ts index 5388d0a..f542386 100644 --- a/src/app/pages/zenodo-communities/zenodo-communities.component.ts +++ b/src/app/pages/zenodo-communities/zenodo-communities.component.ts @@ -29,6 +29,7 @@ import {HelperFunctions} from "../../openaireLibrary/utils/HelperFunctions.class import {SearchInputComponent} from "../../openaireLibrary/sharedComponents/search-input/search-input.component"; import {UntypedFormBuilder, UntypedFormControl} from "@angular/forms"; import {ManageZenodoCommunitiesService} from "../../services/manageZenodoCommunities.service"; +import {OpenaireEntities} from "../../openaireLibrary/utils/properties/searchFields"; @Component({ selector: 'zenodo-communities', @@ -352,4 +353,6 @@ export class ZenodoCommunitiesComponent implements OnInit, OnDestroy { }); this.subCommunityChanged(); } + + protected readonly openAIREEntities = OpenaireEntities; }