Refactor use of research age to academic age

Author: tamu-sad-iii

src/app/+visualization/research-age/research-age.component.html

@@ -13,7 +13,7 @@
       <div class="card shadow bg-white rounded m-1">
         <div class="card-body">
           <div class="h5">Researchers and publications per academic age group</div>
-          <scholars-barplot scale="1" [input]="researchAge" maxOverride="{{maxOverride | async}}"></scholars-barplot>
+          <scholars-barplot scale="1" [input]="academicAge" maxOverride="{{maxOverride | async}}"></scholars-barplot>
         </div>
       </div>
     </div>

src/app/+visualization/research-age/research-age.component.ts

@@ -8,16 +8,16 @@ import { Filterable } from '../../core/model/request';
 import { OpKey } from '../../core/model/view';
 import { AppState } from '../../core/store';
 import { selectResourcesResearchAge } from '../../core/store/sdr';
-import { ResearchAge } from '../../core/store/sdr/sdr.reducer';
+import { AcademicAge } from '../../core/store/sdr/sdr.reducer';
 import { fadeIn } from '../../shared/utilities/animation.utility';
 import { BarplotInput } from '../barplot/barplot.component';
 
 import * as fromSdr from '../../core/store/sdr/sdr.actions';
 
-const researchAgeToBarplotInput = (researchAge: ResearchAge): BarplotInput => {
+const researchAgeToBarplotInput = (academicAge: AcademicAge): BarplotInput => {
   return {
-    label: researchAge.label,
-    data: researchAge.groups
+    label: academicAge.label,
+    data: academicAge.groups
   } as BarplotInput;
 }
 
@@ -41,7 +41,7 @@ export class ResearchAgeComponent implements OnDestroy, OnInit {
 
   public median: Subject<number>;
 
-  public researchAge: Observable<BarplotInput>;
+  public academicAge: Observable<BarplotInput>;
 
   public averagePubRateResearchAge: Observable<BarplotInput>;
 
@@ -82,10 +82,10 @@ export class ResearchAgeComponent implements OnDestroy, OnInit {
         const pk = 'Publications';
         const apk = 'Average publications';
 
-        this.researchAge = this.store.pipe(
+        this.academicAge = this.store.pipe(
           select(selectResourcesResearchAge('individual')),
-          filter((ra: ResearchAge) => ra !== undefined && (ra.label === rk || ra.label === pk)),
-          tap((ra: ResearchAge) => {
+          filter((ra: AcademicAge) => ra !== undefined && (ra.label === rk || ra.label === pk)),
+          tap((ra: AcademicAge) => {
             if (ra.label === rk) {
               this.mean.next(ra.mean);
               this.median.next(ra.median);
@@ -96,7 +96,7 @@ export class ResearchAgeComponent implements OnDestroy, OnInit {
 
         this.averagePubRateResearchAge = this.store.pipe(
           select(selectResourcesResearchAge('individual')),
-          filter((ra: ResearchAge) => ra !== undefined && (ra.label === rk || ra.label === apk)),
+          filter((ra: AcademicAge) => ra !== undefined && (ra.label === rk || ra.label === apk)),
           map(researchAgeToBarplotInput)
         );
 

src/app/core/model/sdr/repo/abstract-sdr-repo.ts

@@ -7,7 +7,7 @@ import { RestService } from '../../../service/rest.service';
 import { SdrRepo } from './sdr-repo';
 
 import { APP_CONFIG, AppConfig } from '../../../../app.config';
-import { DataNetwork, QuantityDistribution, ResearchAge } from '../../../store/sdr/sdr.reducer';
+import { DataNetwork, QuantityDistribution, AcademicAge } from '../../../store/sdr/sdr.reducer';
 import { Boostable, Facetable, Filterable, SdrRequest, Sort } from '../../request';
 import { Queryable } from '../../request/sdr.request';
 import { Count } from '../count';
@@ -65,8 +65,8 @@ export abstract class AbstractSdrRepo<R extends SdrResource> implements SdrRepo<
     averageOverInterval: boolean = false,
     upperLimitInYears: number,
     groupingIntervalInYears: number
-  ): Observable<ResearchAge> {
-    return this.restService.get<ResearchAge>(`${this.appConfig.serviceUrl}/${this.path()}/analytics/researchAge${this.mapParameters({ query, filters })}&label=${label}&dateField=${dateField}&accumulateMultivaluedDate=${accumulateMultivaluedDate}&averageOverInterval=${averageOverInterval}&upperLimitInYears=${upperLimitInYears}&groupingIntervalInYears=${groupingIntervalInYears}`);
+  ): Observable<AcademicAge> {
+    return this.restService.get<AcademicAge>(`${this.appConfig.serviceUrl}/${this.path()}/analytics/academicAge${this.mapParameters({ query, filters })}&label=${label}&dateField=${dateField}&accumulateMultivaluedDate=${accumulateMultivaluedDate}&averageOverInterval=${averageOverInterval}&upperLimitInYears=${upperLimitInYears}&groupingIntervalInYears=${groupingIntervalInYears}`);
   }
 
   public getQuantityDistribution(

src/app/core/store/sdr/sdr.effects.ts

@@ -29,7 +29,7 @@ import { createSdrRequest, buildDateYearFilterValue, buildNumberRangeFilterValue
 import { removeFilterFromQueryParams } from '../../../shared/utilities/view.utility';
 
 import { selectSdrState } from './';
-import { DataNetwork, QuantityDistribution, ResearchAge, SdrState } from './sdr.reducer';
+import { DataNetwork, QuantityDistribution, AcademicAge, SdrState } from './sdr.reducer';
 import { selectRouterState } from '../router';
 import { selectIsStompConnected, selectStompState } from '../stomp';
 
@@ -173,7 +173,7 @@ export class SdrEffects {
         .get(action.name)
         .getResearchAge(action.payload.query, action.payload.filters, action.payload.label, action.payload.dateField, action.payload.accumulateMultivaluedDate, action.payload.averageOverInterval, action.payload.upperLimitInYears, action.payload.groupingIntervalInYears)
         .pipe(
-          map((researchAge: ResearchAge) => new fromSdr.GetResearchAgeSuccessAction(action.name, { researchAge, queue: action.payload.queue })),
+          map((academicAge: AcademicAge) => new fromSdr.GetResearchAgeSuccessAction(action.name, { academicAge, queue: action.payload.queue })),
           catchError((response) =>
             scheduled(
               [

src/app/core/store/sdr/sdr.reducer.ts

@@ -27,7 +27,7 @@ export interface Datum {
   value: number;
 }
 
-export interface ResearchAge {
+export interface AcademicAge {
   label: string;
   dateField: string;
   ranges: Map<string, string>;
@@ -55,7 +55,7 @@ export interface SdrState<R extends SdrResource> extends EntityState<R> {
   links: SdrCollectionLinks;
   recentlyUpdated: SdrResource[];
   dataNetwork: DataNetwork;
-  researchAge: ResearchAge;
+  academicAge: AcademicAge;
   quantityDistribution: QuantityDistribution;
   counting: boolean;
   loading: boolean;
@@ -78,7 +78,7 @@ export const getSdrInitialState = <R extends SdrResource>(key: string) => {
     links: undefined,
     recentlyUpdated: [],
     dataNetwork: undefined,
-    researchAge: undefined,
+    academicAge: undefined,
     quantityDistribution: undefined,
     counting: false,
     loading: false,
@@ -213,10 +213,10 @@ export const getSdrReducer = <R extends SdrResource>(name: string, additionalCon
           error: undefined,
         };
       case getSdrAction(SdrActionTypes.GET_RESEARCH_AGE_SUCCESS, name):
-      const researchAge = action.payload.researchAge;
+      const academicAge = action.payload.academicAge;
       return {
         ...state,
-        researchAge,
+        academicAge,
         loading: false,
         error: undefined,
       };
@@ -373,5 +373,5 @@ export const getFacets = <R extends SdrResource>(state: SdrState<R>) => state.fa
 export const getLinks = <R extends SdrResource>(state: SdrState<R>) => state.links;
 export const getRecentlyUpdated = <R extends SdrResource>(state: SdrState<R>) => state.recentlyUpdated;
 export const getDataNetwork = <R extends SdrResource>(state: SdrState<R>) => state.dataNetwork;
-export const getResearchAge = <R extends SdrResource>(state: SdrState<R>) => state.researchAge;
+export const getResearchAge = <R extends SdrResource>(state: SdrState<R>) => state.academicAge;
 export const getQuantityDistribution = <R extends SdrResource>(state: SdrState<R>) => state.quantityDistribution;