Update material to version 15

claims/claim-utils/claimEntitiesSelection.component.ts

@@ -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:`
-       <span *ngIf="showOptions && showOptions.linkToEntities && showOptions.linkToEntities.length > 0"
-            class=" entitiesSelection portal-box uk-text-small clickable" style=""
-            (click)="open()">
-      <mat-select  [(value)]="showOptions.show"
-                   [disableOptionCentering]="true" >
-  
-        <mat-option *ngIf="showOptions.linkToEntities.indexOf('result')!=-1" value="result">{{openaireEntities.RESULTS}}</mat-option>
-        <mat-option  *ngIf="showOptions.linkToEntities.indexOf('project')!=-1" value="project">{{openaireEntities.PROJECTS}}</mat-option>
-        <mat-option  *ngIf="showOptions.linkToEntities.indexOf('context')!=-1" value="context">{{openaireEntities.COMMUNITIES}}</mat-option>
-        
-      </mat-select>
-  
-      
-     </span>
-    `,
-
-})
-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();
-    }
-  }
- 
-}

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 {SharedModule} from '../../shared/shared.module';
-import { CommonModule }        from '@angular/common';
+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 { }

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,
+    AlertModalModule, ReactiveFormsModule, AdminToolServiceModule, InputModule,
-    MatCheckboxModule, AdminTabsModule, PageContentModule, ClassesRoutingModule, SearchInputModule, IconsModule, LoadingModule
+    AdminTabsModule, PageContentModule, ClassesRoutingModule, SearchInputModule, IconsModule, LoadingModule
   ],
     declarations: [DivIdsComponent],
     exports: [DivIdsComponent]

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: [
+  declarations: [PageContentFormComponent],
-        PageContentFormComponent
+  exports: [PageContentFormComponent]
-    ],
-    exports: [PageContentFormComponent]
 })
-export class PageHelpContentFormModule {}
+export class PageHelpContentFormModule {
+}

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]

landingPages/landing-utils/citeThis/citeThis.component.ts

@@ -1,19 +1,9 @@
-import {
+import {Component, Inject, Input, OnDestroy, OnInit, RendererFactory2, ViewEncapsulation} from '@angular/core';
-  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

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

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: [

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
   ],

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: [

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]
 })

searchPages/searchUtils/advancedSearchForm.component.html

@@ -33,10 +33,7 @@
 												 [options]="fieldIdsOptions" (valueChange)="fieldIdsChanged(i,selectedField.id)" type="select"></div>
 										<div input [(value)]="selectedField.includes" inputClass="border-bottom" [options]="getNotOperators(selectedField)" type="select"></div>
 									</div>
-								 <!-- <mat-select [(ngModel)]="selectedField.id" name="selectField_{{i}}" [disableOptionCentering]="true" class="matSelection" panelClass="matSelectionPanel"
+								></td>
-																(ngModelChange)="fieldIdsChanged(i,selectedField.id)">&lt;!&ndash;(click)="fieldIdsChanged(i)"  &ndash;&gt;
-									<mat-option *ngFor="let id of fieldIds" [value]="id">{{fieldIdsMap[id].name}} </mat-option>
-								</mat-select>--></td>
 								<td *ngIf="selectedField.type == 'keyword' || selectedField.type == 'identifier'">
 									<div class="uk-inline uk-width-expand">
 										<a *ngIf="selectedField.value.length > 0" class="uk-form-icon uk-form-icon-flip"
@@ -105,12 +102,6 @@
 								</td>
 							</tr>
 						</table>
-						<!-- <div class="uk-margin-small-top">
-							<button type="button" (click)="addField()" class="uk-button uk-button-link uk-flex uk-flex-middle">
-								<icon name="add" [flex]="true"></icon>
-								<span class="uk-margin-small-left">Add rule</span>
-							</button>
-						</div> -->
 						<div class=" uk-text-center uk-margin-small-top">
 							<div *ngIf="!validDateFrom && validDateTo" class="uk-text-danger">
 								Please check your <u>from</u> date

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,

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,

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',

searchPages/searchUtils/searchFilter.module.ts

@@ -1,29 +1,25 @@
-import { NgModule}            from '@angular/core';
+import {NgModule} from '@angular/core';
-import { CommonModule }        from '@angular/common';
+import {CommonModule} from '@angular/common';
-import { FormsModule }         from '@angular/forms';
+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 {
+}

searchPages/searchUtils/searchSorting.module.ts

@@ -1,16 +1,14 @@
-import { NgModule}            from '@angular/core';
+import {NgModule} from '@angular/core';
-import { CommonModule }        from '@angular/common';
+import {CommonModule} from '@angular/common';
-import { FormsModule }         from '@angular/forms';
+import {FormsModule} from '@angular/forms';
-import { RouterModule }       from '@angular/router';
+import {RouterModule} from '@angular/router';
 
-import{SearchSortingComponent} from './searchSorting.component';
+import {SearchSortingComponent} from './searchSorting.component';
-import { MatSelectModule } from "@angular/material/select";
 import {InputModule} from '../../sharedComponents/input/input.module';
 
 @NgModule({
   imports: [
-    CommonModule, FormsModule, RouterModule, MatSelectModule,
+    CommonModule, FormsModule, RouterModule, InputModule
-		InputModule
   ],
   declarations: [
     SearchSortingComponent

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]
 })

utils/entities/entities.module.ts

@@ -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 { }