Skip to content

Commit

Permalink
Noissue. Rename models with bad naming
Browse files Browse the repository at this point in the history
  • Loading branch information
const8ine committed Sep 14, 2024
1 parent 1b1363c commit 0669a92
Show file tree
Hide file tree
Showing 14 changed files with 15 additions and 15 deletions.
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { ChangeDetectionStrategy, Component, Input, OnInit, TemplateRef } from '@angular/core';
import { Studies } from '../../../core/models/open-genes-api/researches.model';
import { Studies } from '../../../core/models/open-genes-api/studies.model';
import { MatBottomSheet } from '@angular/material/bottom-sheet';
import { CommonBottomSheetComponent } from '../../ui-components/components/modals/common-bottom-sheet/common-bottom-sheet.component';

Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { Component } from '@angular/core';
import { ResearchTables } from '../research-tables';
import { MatDialog } from '@angular/material/dialog';
import { PurpleTable } from '../../../../core/models/open-genes-api/researches.model';
import { PurpleTable } from '../../../../core/models/open-genes-api/studies.model';

@Component({
selector: 'app-increase-lifespan',
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { PurpleTable } from './researches.model';
import { PurpleTable } from './studies.model';

export interface GenesWLifespanResearches {
id: number;
Expand Down
2 changes: 1 addition & 1 deletion src/app/core/models/open-genes-api/genes.model.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { Studies } from './researches.model';
import { Studies } from './studies.model';
import { Origin } from './origin.model';
import { Terms, TermsLegacy } from './gene-ontology.model';
import { HumanProteinAtlas } from './human-protein-atlas.model';
Expand Down
4 changes: 2 additions & 2 deletions src/app/core/services/api/open-genes-api.service.ts
Original file line number Diff line number Diff line change
Expand Up @@ -12,13 +12,13 @@ import {
} from '../../models';
import { TranslateService } from '@ngx-translate/core';
import { AssociatedDiseaseCategories, AssociatedDiseases } from '../../models/open-genes-api/associated-diseases.model';
import { GenesWLifespanResearches } from '../../models/open-genes-api/genes-with-increase-lifespan-researches.model';
import { GenesWLifespanResearches } from '../../models/open-genes-api/genes-with-increase-lifespan-studies.model';
import { GenesInHorvathClock } from '../../models/open-genes-api/genes-in-horvath-clock.model';
import { ApiResponse } from '../../models/api-response.model';
import { SearchModel } from '../../models/open-genes-api/search.model';
import { Pagination } from '../../models/settings.model';
import { Diet } from '../../models/open-genes-api/diet.model';
import { ResearchArguments, ResearchTypes } from '../../models/open-genes-api/researches.model';
import { ResearchArguments, ResearchTypes } from '../../models/open-genes-api/studies.model';
import { ModelOrganism } from '../../models/open-genes-api/model-organism.model';

@Injectable({
Expand Down
4 changes: 2 additions & 2 deletions src/app/core/services/csv-export-service.ts
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
import { Injectable } from '@angular/core';
import { AdditionalInterventionResolver } from '../utils/additional-intervention-resolver';
import { PurpleTable } from '../models/open-genes-api/researches.model';
import { PurpleTable } from '../models/open-genes-api/studies.model';
import { environment } from '../../../environments/environment';

@Injectable({
providedIn: 'root',
})
export class CsvExportService extends AdditionalInterventionResolver {
// private genes: Genes[]; // TODO: save cached response here
// private researches: any[]; // TODO: add typing from OG-724
// private studies: any[]; // TODO: add typing from OG-724
private emptyCellValue = 'n/a';
private maxPageSize = 0;
private del = '\t'; // delimiter - tab symbol
Expand Down
2 changes: 1 addition & 1 deletion src/app/core/services/filters/studies-filter.service.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import { TranslateService } from '@ngx-translate/core';
import { Router } from '@angular/router';
import { SettingsService } from '../settings.service';
import { ApiResponse } from '../../models/api-response.model';
import { ResearchArguments, ResearchTypes } from '../../models/open-genes-api/researches.model';
import { ResearchArguments, ResearchTypes } from '../../models/open-genes-api/studies.model';
import { ApiService } from '../api/open-genes-api.service';
import { FilterService } from './filter.service';

Expand Down
2 changes: 1 addition & 1 deletion src/app/core/utils/additional-intervention-resolver.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { PurpleTable } from '../models/open-genes-api/researches.model';
import { PurpleTable } from '../models/open-genes-api/studies.model';

export abstract class AdditionalInterventionResolver {
resolveAdditionalIntervention(research: PurpleTable, targetGene = research.geneId): boolean {
Expand Down
2 changes: 1 addition & 1 deletion src/app/core/utils/utils.mixin.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { ToMap } from './to-map';
import { AdditionalInterventionResolver } from './additional-intervention-resolver';
import { PurpleTable } from '../models/open-genes-api/researches.model';
import { PurpleTable } from '../models/open-genes-api/studies.model';

function applyUtils(derivedConstructor: any, baseConstructors: any[]) {
baseConstructors.forEach((baseConstructor) => {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import {
OnInit,
Output, ViewChild,
} from '@angular/core';
import { ResearchArguments, ResearchTypes } from '../../../../core/models/open-genes-api/researches.model';
import { ResearchArguments, ResearchTypes } from '../../../../core/models/open-genes-api/studies.model';
import { debounceTime, distinctUntilChanged, map, switchMap, takeUntil } from 'rxjs/operators';
import { ApiResponse, PageOptions } from '../../../../core/models/api-response.model';
import { BehaviorSubject, ReplaySubject, Subject } from 'rxjs';
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { ChangeDetectionStrategy, ChangeDetectorRef, Component, OnDestroy, OnInit } from '@angular/core';
import { ResearchArguments } from '../../core/models/open-genes-api/researches.model';
import { ResearchArguments } from '../../core/models/open-genes-api/studies.model';
import { WindowWidth } from '../../core/utils/window-width';
import { WindowService } from '../../core/services/browser/window.service';
import { BehaviorSubject } from 'rxjs';
Expand Down
2 changes: 1 addition & 1 deletion src/app/pages/gene/gene.component.ts
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ import { GenesFilterService } from '../../core/services/filters/genes-filter.ser
import { Gene, Ortholog } from '../../core/models';
import { ApiGeneSearchFilter } from '../../core/models/filters/filter.model';
import { Utils } from '../../core/utils/utils.mixin';
import { Studies } from 'src/app/core/models/open-genes-api/researches.model';
import { Studies } from 'src/app/core/models/open-genes-api/studies.model';

@Component({
selector: 'app-gene-page',
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { Component, Input, OnInit } from '@angular/core';
import { Studies } from '../../../core/models/open-genes-api/researches.model';
import { Studies } from '../../../core/models/open-genes-api/studies.model';

@Component({
selector: 'app-research-data',
Expand Down

0 comments on commit 0669a92

Please sign in to comment.