diff --git a/claims/claim-utils/claimEntitiesSelection.component.ts b/claims/claim-utils/claimEntitiesSelection.component.ts
deleted file mode 100644
index 66c70f71..00000000
--- a/claims/claim-utils/claimEntitiesSelection.component.ts
+++ /dev/null
@@ -1,39 +0,0 @@
-import {Component, Input, ViewChild} from '@angular/core';
-import {ShowOptions} from './claimHelper.class';
-import {MatSelect} from "@angular/material/select";
-import {OpenaireEntities} from "../../utils/properties/searchFields";
-
-
-@Component({
- selector: 'claim-enities-selection',
-
- template:`
- 0"
- class=" entitiesSelection portal-box uk-text-small clickable" style=""
- (click)="open()">
-
-
- {{openaireEntities.RESULTS}}
- {{openaireEntities.PROJECTS}}
- {{openaireEntities.COMMUNITIES}}
-
-
-
-
-
- `,
-
-})
-export class ClaimEntitiesSelectionComponent{
- @ViewChild(MatSelect) matSelect: MatSelect;
- @Input() showOptions:ShowOptions = new ShowOptions();
- public openaireEntities = OpenaireEntities;
-
- open() {
- if (this.matSelect && !this.matSelect.focused) {
- this.matSelect.open();
- }
- }
-
-}
diff --git a/claims/claim-utils/claimProjectSearchForm.module.ts b/claims/claim-utils/claimProjectSearchForm.module.ts
index 5293d430..3d2ace89 100644
--- a/claims/claim-utils/claimProjectSearchForm.module.ts
+++ b/claims/claim-utils/claimProjectSearchForm.module.ts
@@ -1,11 +1,9 @@
-import { NgModule } from '@angular/core';
+import {NgModule} from '@angular/core';
-import { SharedModule } from '../../../openaireLibrary/shared/shared.module';
-import { CommonModule } from '@angular/common';
+import {SharedModule} from '../../shared/shared.module';
+import {CommonModule} from '@angular/common';
import {ClaimProjectsSearchFormComponent} from './claimProjectSearchForm.component';
-// import {LoadingModalModule} from '../../utils/modal/loadingModal.module';
-
import {ProjectServiceModule} from '../../landingPages/project/projectService.module';
import {ProjectsServiceModule} from '../../services/projectsService.module';
import {EntitiesAutocompleteModule} from '../../utils/entitiesAutoComplete/entitiesAutoComplete.module';
@@ -13,29 +11,25 @@ import {HelperModule} from '../../utils/helper/helper.module';
import {ClaimResultsModule} from './claimResults.module';
-import {PagingModule } from '../../utils/paging.module';
+import {PagingModule} from '../../utils/paging.module';
import {SearchFilterModule} from '../../searchPages/searchUtils/searchFilter.module';
import {RangeFilterModule} from "../../utils/rangeFilter/rangeFilter.module";
-import {ClaimEntitiesSelectionComponent} from "./claimEntitiesSelection.component";
-import {MatSelectModule} from "@angular/material/select";
import {AdvancedSearchInputModule} from "../../sharedComponents/advanced-search-input/advanced-search-input.module";
import {InputModule} from "../../sharedComponents/input/input.module";
import {DropdownFilterModule} from "../../utils/dropdown-filter/dropdown-filter.module";
- @NgModule({
+@NgModule({
imports: [
SharedModule, CommonModule,
// LoadingModalModule,
ProjectServiceModule, ProjectsServiceModule, EntitiesAutocompleteModule, HelperModule,
- PagingModule, SearchFilterModule, ClaimResultsModule, RangeFilterModule, MatSelectModule, AdvancedSearchInputModule, InputModule, DropdownFilterModule
+ PagingModule, SearchFilterModule, ClaimResultsModule, RangeFilterModule, AdvancedSearchInputModule, InputModule, DropdownFilterModule
],
providers:[
],
declarations: [
ClaimProjectsSearchFormComponent,
- ClaimEntitiesSelectionComponent
-
],
- exports: [ClaimProjectsSearchFormComponent, ClaimEntitiesSelectionComponent]
+ exports: [ClaimProjectsSearchFormComponent]
})
export class ClaimProjectsSearchFormModule { }
diff --git a/dashboard/divId/divIds.module.ts b/dashboard/divId/divIds.module.ts
index e379ded4..eca996e6 100644
--- a/dashboard/divId/divIds.module.ts
+++ b/dashboard/divId/divIds.module.ts
@@ -6,14 +6,6 @@ import {AlertModalModule} from '../../utils/modal/alertModal.module';
import {DivIdsComponent} from './divIds.component';
import {AdminToolServiceModule} from "../../services/adminToolService.module";
import {InputModule} from "../../sharedComponents/input/input.module";
-
-
-import {MatAutocompleteModule} from '@angular/material/autocomplete';
-import { MatCheckboxModule } from "@angular/material/checkbox";
-import { MatFormFieldModule } from "@angular/material/form-field";
-
-
-import {MatChipsModule} from '@angular/material/chips';
import {AdminTabsModule} from "../sharedComponents/admin-tabs/admin-tabs.module";
import {PageContentModule} from "../sharedComponents/page-content/page-content.module";
import {ClassesRoutingModule} from "./classes-routing.module";
@@ -24,8 +16,8 @@ import {LoadingModule} from "../../utils/loading/loading.module";
@NgModule({
imports: [
CommonModule, RouterModule, FormsModule,
- AlertModalModule, ReactiveFormsModule, AdminToolServiceModule, InputModule, MatAutocompleteModule, MatFormFieldModule, MatChipsModule,
- MatCheckboxModule, AdminTabsModule, PageContentModule, ClassesRoutingModule, SearchInputModule, IconsModule, LoadingModule
+ AlertModalModule, ReactiveFormsModule, AdminToolServiceModule, InputModule,
+ AdminTabsModule, PageContentModule, ClassesRoutingModule, SearchInputModule, IconsModule, LoadingModule
],
declarations: [DivIdsComponent],
exports: [DivIdsComponent]
diff --git a/dashboard/helpTexts/page-help-content-form.module.ts b/dashboard/helpTexts/page-help-content-form.module.ts
index 243a11d7..27e34ae4 100644
--- a/dashboard/helpTexts/page-help-content-form.module.ts
+++ b/dashboard/helpTexts/page-help-content-form.module.ts
@@ -8,21 +8,20 @@ import {PageContentFormComponent} from './page-help-content-form.component';
import {PageHelpContentFormRoutingModule} from './page-help-content-form-routing.module';
import {AdminToolServiceModule} from '../../services/adminToolService.module';
import {InputModule} from '../../sharedComponents/input/input.module';
-import {MatSlideToggleModule} from '@angular/material/slide-toggle';
import {IconsModule} from '../../utils/icons/icons.module';
import {PageContentModule} from '../sharedComponents/page-content/page-content.module';
import {RouterModule} from '@angular/router';
import {LoadingModule} from '../../utils/loading/loading.module';
+import {MatSlideToggleModule} from "@angular/material/slide-toggle";
@NgModule({
imports: [
CommonModule, FormsModule, RouterModule,
SafeHtmlPipeModule, CKEditorModule,
- AlertModalModule, ReactiveFormsModule, PageHelpContentFormRoutingModule, AdminToolServiceModule, InputModule, MatSlideToggleModule, IconsModule, PageContentModule, LoadingModule
+ AlertModalModule, ReactiveFormsModule, PageHelpContentFormRoutingModule, AdminToolServiceModule, InputModule, IconsModule, PageContentModule, LoadingModule, MatSlideToggleModule
],
- declarations: [
- PageContentFormComponent
- ],
- exports: [PageContentFormComponent]
+ declarations: [PageContentFormComponent],
+ exports: [PageContentFormComponent]
})
-export class PageHelpContentFormModule {}
+export class PageHelpContentFormModule {
+}
diff --git a/landingPages/feedback/feedback.module.ts b/landingPages/feedback/feedback.module.ts
index 23ba3680..69f72d67 100644
--- a/landingPages/feedback/feedback.module.ts
+++ b/landingPages/feedback/feedback.module.ts
@@ -3,7 +3,6 @@ import {CommonModule} from "@angular/common";
import {FeedbackComponent} from "./feedback.component";
import {LandingHeaderModule} from "../landing-utils/landing-header/landing-header.module";
import {ReactiveFormsModule} from "@angular/forms";
-import {MatSelectModule} from "@angular/material/select";
import {AlertModalModule} from "../../utils/modal/alertModal.module";
import {EmailService} from "../../utils/email/email.service";
import {RecaptchaModule} from "ng-recaptcha";
@@ -11,7 +10,7 @@ import {IconsModule} from "../../utils/icons/icons.module";
import {InputModule} from "../../sharedComponents/input/input.module";
@NgModule({
- imports: [CommonModule, LandingHeaderModule, ReactiveFormsModule, MatSelectModule, AlertModalModule, RecaptchaModule, IconsModule, InputModule],
+ imports: [CommonModule, LandingHeaderModule, ReactiveFormsModule, AlertModalModule, RecaptchaModule, IconsModule, InputModule],
declarations: [FeedbackComponent],
providers: [EmailService],
exports: [FeedbackComponent]
diff --git a/landingPages/landing-utils/citeThis/citeThis.component.ts b/landingPages/landing-utils/citeThis/citeThis.component.ts
index 0334d387..660a4b0d 100644
--- a/landingPages/landing-utils/citeThis/citeThis.component.ts
+++ b/landingPages/landing-utils/citeThis/citeThis.component.ts
@@ -1,19 +1,9 @@
-import {
- Component,
- Inject,
- Input,
- OnDestroy,
- OnInit,
- RendererFactory2,
- ViewEncapsulation
-} from '@angular/core';
+import {Component, Inject, Input, OnDestroy, OnInit, RendererFactory2, ViewEncapsulation} from '@angular/core';
import {Citation, CitationData} from './citation.class';
-import {ResultLandingInfo} from "../../../utils/entities/resultLandingInfo";
import {DOCUMENT} from "@angular/common";
import {EnvProperties} from "../../../utils/properties/env-properties";
import {properties} from "../../../../../environments/environment";
import {PiwikService} from "../../../utils/piwik/piwik.service";
-import {ResultPreview} from "../../../utils/result-preview/result-preview";
declare var Cite: any;
// Based on https://citation.js.org/api/tutorial-getting_started.html browser release
diff --git a/landingPages/landing-utils/citeThis/citeThis.module.ts b/landingPages/landing-utils/citeThis/citeThis.module.ts
index 53583b5f..8de1bdbc 100644
--- a/landingPages/landing-utils/citeThis/citeThis.module.ts
+++ b/landingPages/landing-utils/citeThis/citeThis.module.ts
@@ -3,13 +3,12 @@ import {CommonModule} from '@angular/common';
import {FormsModule} from '@angular/forms';
import {CiteThisComponent} from './citeThis.component';
-import { MatSelectModule } from "@angular/material/select";
import {InputModule} from "../../../sharedComponents/input/input.module";
@NgModule({
imports: [
- CommonModule, FormsModule, MatSelectModule, InputModule
+ CommonModule, FormsModule, InputModule
],
declarations: [
CiteThisComponent
diff --git a/landingPages/organization/organization.module.ts b/landingPages/organization/organization.module.ts
index a367d897..9a4a2737 100644
--- a/landingPages/organization/organization.module.ts
+++ b/landingPages/organization/organization.module.ts
@@ -23,7 +23,6 @@ import {HelperModule} from "../../utils/helper/helper.module";
import {OrganizationsDeletedByInferenceModule} from "./deletedByInference/deletedByInference.module";
import {LandingHeaderModule} from "../landing-utils/landing-header/landing-header.module";
import {FeedbackModule} from "../feedback/feedback.module";
-import {MatSelectModule} from "@angular/material/select";
import {TabsModule} from "../../utils/tabs/tabs.module";
import {SearchTabModule} from "../../utils/tabs/contents/search-tab.module";
import {LoadingModule} from '../../utils/loading/loading.module';
@@ -50,7 +49,6 @@ import {EntityActionsModule} from "../../utils/entity-actions/entity-actions.mod
ProjectsServiceModule,
Schema2jsonldModule, SEOServiceModule, HelperModule,
OrganizationsDeletedByInferenceModule, LandingHeaderModule, FeedbackModule,
- MatSelectModule,
TabsModule, SearchTabModule, LoadingModule, IconsModule, InputModule, FullScreenModalModule, EGIDataTransferModule, EntityActionsModule
],
declarations: [
diff --git a/landingPages/project/project.module.ts b/landingPages/project/project.module.ts
index e17a294c..713c9f1f 100644
--- a/landingPages/project/project.module.ts
+++ b/landingPages/project/project.module.ts
@@ -2,7 +2,6 @@ import {NgModule} from '@angular/core';
import {CommonModule} from '@angular/common';
import {FormsModule} from '@angular/forms';
import {RouterModule} from '@angular/router';
-import {MatSelectModule} from "@angular/material/select";
import {ProjectComponent} from './project.component';
import {ProjectServiceModule} from './projectService.module';
@@ -41,7 +40,7 @@ import {EntityActionsModule} from "../../utils/entity-actions/entity-actions.mod
IFrameModule, ReportsServiceModule,
SearchResearchResultsServiceModule, ProjectServiceModule,
Schema2jsonldModule, SEOServiceModule, HelperModule,
- LandingHeaderModule, MatSelectModule, FeedbackModule, AltMetricsModule,
+ LandingHeaderModule, FeedbackModule, AltMetricsModule,
TabsModule, SearchTabModule, LoadingModule, IconsModule, InputModule,
FullScreenModalModule, SafeHtmlPipeModule, EGIDataTransferModule, EntityActionsModule
],
diff --git a/landingPages/result/resultLanding.module.ts b/landingPages/result/resultLanding.module.ts
index 67a0a8fb..3803a598 100644
--- a/landingPages/result/resultLanding.module.ts
+++ b/landingPages/result/resultLanding.module.ts
@@ -28,8 +28,6 @@ import {FeedbackModule} from "../feedback/feedback.module";
import {TabsModule} from "../../utils/tabs/tabs.module";
import {LoadingModule} from "../../utils/loading/loading.module";
import {OrcidModule} from "../../orcid/orcid.module";
-import {MatFormFieldModule} from "@angular/material/form-field";
-import {MatSelectModule} from "@angular/material/select";
import {IconsModule} from "../../utils/icons/icons.module";
import {IconsService} from "../../utils/icons/icons.service";
import {cite, fire, graph, landmark, link, link_to, quotes, rocket, versions} from "../../utils/icons/icons";
@@ -48,7 +46,7 @@ import {EntityActionsModule} from "../../utils/entity-actions/entity-actions.mod
AltMetricsModule, Schema2jsonldModule, SEOServiceModule,
DeletedByInferenceModule, ShowAuthorsModule, HelperModule, ResultLandingUtilsModule, AlertModalModule,
AnnotationModule, LandingHeaderModule, NoLoadPaging, ResultPreviewModule, FeedbackModule, TabsModule, LoadingModule,
- OrcidModule, MatFormFieldModule, MatSelectModule, IconsModule, InputModule, EGIDataTransferModule, RecaptchaModule,
+ OrcidModule, IconsModule, InputModule, EGIDataTransferModule, RecaptchaModule,
SdgFosSuggestModule, FullScreenModalModule, SafeHtmlPipeModule, EntityActionsModule
],
declarations: [
diff --git a/notifications/notify-form/notify-form.module.ts b/notifications/notify-form/notify-form.module.ts
index ea7dda32..84e4ede3 100644
--- a/notifications/notify-form/notify-form.module.ts
+++ b/notifications/notify-form/notify-form.module.ts
@@ -1,13 +1,12 @@
import {NgModule} from "@angular/core";
import {NotifyFormComponent} from "./notify-form.component";
import {CommonModule} from "@angular/common";
-import {MatCheckboxModule} from "@angular/material/checkbox";
import {ReactiveFormsModule} from "@angular/forms";
import {InputModule} from "../../sharedComponents/input/input.module";
import {NotificationUserModule} from "../notification-user/notification-user.module";
@NgModule({
- imports: [CommonModule, MatCheckboxModule, ReactiveFormsModule, InputModule, NotificationUserModule],
+ imports: [CommonModule, ReactiveFormsModule, InputModule, NotificationUserModule],
declarations: [NotifyFormComponent],
exports: [NotifyFormComponent]
})
diff --git a/searchPages/searchUtils/advancedSearchForm.component.html b/searchPages/searchUtils/advancedSearchForm.component.html
index f0d88901..846c6bc2 100644
--- a/searchPages/searchUtils/advancedSearchForm.component.html
+++ b/searchPages/searchUtils/advancedSearchForm.component.html
@@ -33,10 +33,7 @@
[options]="fieldIdsOptions" (valueChange)="fieldIdsChanged(i,selectedField.id)" type="select">
-
+ >
|
-
Please check your from date
diff --git a/searchPages/searchUtils/advancedSearchForm.module.ts b/searchPages/searchUtils/advancedSearchForm.module.ts
index d9cf2b9b..5d5c17a0 100644
--- a/searchPages/searchUtils/advancedSearchForm.module.ts
+++ b/searchPages/searchUtils/advancedSearchForm.module.ts
@@ -10,7 +10,6 @@ import {DateFilterModule} from './dateFilter.module';
import {SearchFormModule} from './searchForm.module';
import {QuickSelectionsModule} from "./quick-selections.module";
import {EntitiesSelectionModule} from "./entitiesSelection.module";
-import {MatSelectModule} from "@angular/material/select";
import {IconsModule} from "../../utils/icons/icons.module";
import {SearchInputModule} from "../../sharedComponents/search-input/search-input.module";
import {AdvancedSearchInputModule} from "../../sharedComponents/advanced-search-input/advanced-search-input.module";
@@ -22,7 +21,7 @@ import {filters} from "../../utils/icons/icons";
@NgModule({
imports: [
CommonModule, FormsModule, RouterModule, EntitiesAutocompleteModule, StaticAutocompleteModule, DateFilterModule,
- SearchFormModule, QuickSelectionsModule, EntitiesSelectionModule, MatSelectModule, IconsModule, SearchInputModule, AdvancedSearchInputModule, InputModule
+ SearchFormModule, QuickSelectionsModule, EntitiesSelectionModule, IconsModule, SearchInputModule, AdvancedSearchInputModule, InputModule
],
declarations: [
AdvancedSearchFormComponent,
diff --git a/searchPages/searchUtils/entitiesSelection.module.ts b/searchPages/searchUtils/entitiesSelection.module.ts
index 9a281ee4..e10a0e9d 100644
--- a/searchPages/searchUtils/entitiesSelection.module.ts
+++ b/searchPages/searchUtils/entitiesSelection.module.ts
@@ -3,13 +3,12 @@ import {CommonModule} from '@angular/common';
import {FormsModule, ReactiveFormsModule} from '@angular/forms';
import {RouterModule} from '@angular/router';
import {EntitiesSelectionComponent} from "./entitiesSelection.component";
-import { MatSelectModule } from "@angular/material/select";
import {InputModule} from "../../sharedComponents/input/input.module";
@NgModule({
imports: [
CommonModule, FormsModule,
- RouterModule, ReactiveFormsModule, MatSelectModule, InputModule
+ RouterModule, ReactiveFormsModule, InputModule
],
declarations: [
EntitiesSelectionComponent,
diff --git a/searchPages/searchUtils/quick-selections.component.ts b/searchPages/searchUtils/quick-selections.component.ts
index ee9dd8b4..0931a405 100644
--- a/searchPages/searchUtils/quick-selections.component.ts
+++ b/searchPages/searchUtils/quick-selections.component.ts
@@ -6,7 +6,6 @@ import {ConfigurationService} from "../../utils/configuration/configuration.serv
import {Subscription} from "rxjs";
import {ActivatedRoute, Router} from "@angular/router";
import {properties} from "../../../../environments/environment";
-import {OpenaireEntities} from "../../utils/properties/searchFields";
@Component({
selector: 'quick-selections',
diff --git a/searchPages/searchUtils/searchFilter.module.ts b/searchPages/searchUtils/searchFilter.module.ts
index 382884c1..6f8bc92b 100644
--- a/searchPages/searchUtils/searchFilter.module.ts
+++ b/searchPages/searchUtils/searchFilter.module.ts
@@ -1,29 +1,25 @@
-import { NgModule} from '@angular/core';
-import { CommonModule } from '@angular/common';
-import { FormsModule } from '@angular/forms';
+import {NgModule} from '@angular/core';
+import {CommonModule} from '@angular/common';
+import {FormsModule} from '@angular/forms';
import {SearchFilterComponent} from './searchFilter.component';
-import{SearchFilterModalComponent} from './searchFilterModal.component';
+import {SearchFilterModalComponent} from './searchFilterModal.component';
import {ModalModule} from '../../utils/modal/modal.module';
-import { MatSelectModule } from "@angular/material/select";
import {RouterModule} from "@angular/router";
import {InputModule} from '../../sharedComponents/input/input.module';
import {IconsModule} from "../../utils/icons/icons.module";
@NgModule({
imports: [
- CommonModule, FormsModule, ModalModule, MatSelectModule, RouterModule,
+ CommonModule, FormsModule, ModalModule, RouterModule,
InputModule, IconsModule
],
declarations: [
SearchFilterComponent, SearchFilterModalComponent
-],
-
- providers:[
],
exports: [
SearchFilterComponent, SearchFilterModalComponent
-
- ]
+ ]
})
-export class SearchFilterModule { }
+export class SearchFilterModule {
+}
diff --git a/searchPages/searchUtils/searchSorting.module.ts b/searchPages/searchUtils/searchSorting.module.ts
index 140dc0fa..51992dfd 100644
--- a/searchPages/searchUtils/searchSorting.module.ts
+++ b/searchPages/searchUtils/searchSorting.module.ts
@@ -1,16 +1,14 @@
-import { NgModule} from '@angular/core';
-import { CommonModule } from '@angular/common';
-import { FormsModule } from '@angular/forms';
-import { RouterModule } from '@angular/router';
+import {NgModule} from '@angular/core';
+import {CommonModule} from '@angular/common';
+import {FormsModule} from '@angular/forms';
+import {RouterModule} from '@angular/router';
-import{SearchSortingComponent} from './searchSorting.component';
-import { MatSelectModule } from "@angular/material/select";
+import {SearchSortingComponent} from './searchSorting.component';
import {InputModule} from '../../sharedComponents/input/input.module';
@NgModule({
imports: [
- CommonModule, FormsModule, RouterModule, MatSelectModule,
- InputModule
+ CommonModule, FormsModule, RouterModule, InputModule
],
declarations: [
SearchSortingComponent
diff --git a/sharedComponents/search-input/search-input.module.ts b/sharedComponents/search-input/search-input.module.ts
index 158b7815..7e5c2de4 100644
--- a/sharedComponents/search-input/search-input.module.ts
+++ b/sharedComponents/search-input/search-input.module.ts
@@ -1,13 +1,12 @@
import {NgModule} from '@angular/core';
import {SharedModule} from '../../../openaireLibrary/shared/shared.module';
import {SearchInputComponent} from './search-input.component';
-import {MatAutocompleteModule} from '@angular/material/autocomplete';
import {IconsModule} from '../../utils/icons/icons.module';
import {InputModule} from "../input/input.module";
import {ClickModule} from "../../utils/click/click.module";
@NgModule({
- imports: [SharedModule, MatAutocompleteModule, IconsModule, InputModule, ClickModule],
+ imports: [SharedModule, IconsModule, InputModule, ClickModule],
declarations: [SearchInputComponent],
exports: [SearchInputComponent]
})
diff --git a/utils/entities/entities.module.ts b/utils/entities/entities.module.ts
deleted file mode 100644
index 76e06335..00000000
--- a/utils/entities/entities.module.ts
+++ /dev/null
@@ -1,23 +0,0 @@
-import { NgModule } from '@angular/core';
-import { CommonModule } from '@angular/common';
-import { FormsModule } from '@angular/forms';
-
-
-//Entities
-import {OrganizationInfo} from './organizationInfo';
-import {ProjectInfo} from './projectInfo';
-import {Publication} from './publication';
-import {ResultLandingInfo} from './resultLandingInfo';
-import {SearchResult} from './searchResult';
-import {DataProviderInfo} from './dataProviderInfo';
-import {Metrics} from './metrics';
-
-@NgModule({
- imports: [ CommonModule, FormsModule ],
- declarations: [
-
- ],
- exports: [
- ]
-})
-export class EntitiesModule { }