Skip to content
This repository has been archived by the owner on Dec 16, 2024. It is now read-only.

fix enrichment download, lint and tests #137

Merged
merged 1 commit into from
Mar 25, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,5 +28,5 @@ jobs:
- run: npm i -g @angular/cli
- run: npm i -g nx
- run: npm i
- run: ng run-many --all --target=lint
- run: ng run-many --all --target=test -- --no-watch --no-progress --browsers=ChromeHeadlessCI
- run: ng run-many --target=lint
- run: ng run-many --target=test -- --no-watch --no-progress --browsers=ChromeHeadlessCI
6 changes: 1 addition & 5 deletions apps/ramp-client-e2e/project.json
Original file line number Diff line number Diff line change
Expand Up @@ -18,11 +18,7 @@
}
},
"lint": {
"executor": "@nx/eslint:lint",
"outputs": ["{options.outputFile}"],
"options": {
"lintFilePatterns": ["apps/ramp-client-e2e/**/*.{js,ts}"]
}
"executor": "@nx/eslint:lint"
}
},
"tags": [],
Expand Down
8 changes: 1 addition & 7 deletions apps/ramp-client/project.json
Original file line number Diff line number Diff line change
Expand Up @@ -107,13 +107,7 @@
}
},
"lint": {
"executor": "@nx/eslint:lint",
"options": {
"lintFilePatterns": [
"apps/ramp-client/src/**/*.ts",
"apps/ramp-client/src/**/*.html"
]
}
"executor": "@nx/eslint:lint"
},
"test": {
"executor": "@nx/jest:jest",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -301,7 +301,7 @@ export class PathwayEnrichmentComponent
allDataAsDataProperty!: { [key: string]: DataProperty }[];
pathwayDataAsDataProperty!: { [key: string]: DataProperty }[];
image!: SafeHtml;
enrichedDataframe!: unknown[] | FishersDataframe;
enrichedDataframe!: FishersDataframe;
tooBig = false;
analyteType = '';

Expand Down Expand Up @@ -364,8 +364,8 @@ export class PathwayEnrichmentComponent
this.query = res.query;
}
if (res && res.dataframe) {
this.enrichedDataframe = res.dataframe;
if (this.enrichedDataframe instanceof FishersDataframe && this.enrichedDataframe.analyte_type) {
this.enrichedDataframe = res.dataframe as FishersDataframe;
if (this.enrichedDataframe.analyte_type) {
this.selectedEnrichmentColumns =
this.enrichmentColumns[
this.enrichedDataframe.analyte_type[0]
Expand Down Expand Up @@ -517,7 +517,7 @@ export class PathwayEnrichmentComponent

fetchEnrichedPathwaysFile(): void {
let data: unknown[];
if (this.enrichedDataframe instanceof FishersDataframe && this.enrichedDataframe.fishresults) {
if (this.enrichedDataframe.fishresults) {
data = this.enrichedDataframe.fishresults as unknown[]
} else {
data = this.enrichedDataframe as unknown[]
Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
<!--
<div class="content-panel">
<div class="row space-around-row">
<div class="full-width">
Expand Down Expand Up @@ -39,3 +40,4 @@ <h1 class="page-title">
>
</ramp-query-page>
</div>
-->
Original file line number Diff line number Diff line change
@@ -1,9 +1,5 @@
import { ComponentFixture, TestBed } from '@angular/core/testing';
import { BrowserAnimationsModule } from "@angular/platform-browser/animations";
import { provideEffects } from "@ngrx/effects";
import { provideStore, StoreModule } from "@ngrx/store";
import { provideStoreDevtools } from "@ngrx/store-devtools";
import { RampEffects, rampReducer } from "@ramp/stores/ramp-store";
import { FeaturesRampReactionClassesFromAnalytesComponent } from './features-ramp-reaction-classes-from-analytes.component';

describe('FeaturesRampReactionClassesFromAnalytesComponent', () => {
Expand All @@ -12,18 +8,11 @@ describe('FeaturesRampReactionClassesFromAnalytesComponent', () => {

beforeEach(async () => {
await TestBed.configureTestingModule({
declarations: [],
imports: [
BrowserAnimationsModule,
FeaturesRampReactionClassesFromAnalytesComponent,
StoreModule
],
providers: [
provideStore({
rampStore: rampReducer
}),
provideEffects([RampEffects]),
provideStoreDevtools({ maxAge: 25, logOnly: false }),
],
FeaturesRampReactionClassesFromAnalytesComponent
]
}).compileComponents();

fixture = TestBed.createComponent(
Expand Down
Original file line number Diff line number Diff line change
@@ -1,34 +1,18 @@
import { ChangeDetectorRef, Component, OnInit } from "@angular/core";
import { CommonModule, TitleCasePipe } from "@angular/common";
import { InputRowComponent } from "@ramp/shared/ramp/input-row";
import { PageCoreComponent } from "@ramp/shared/ramp/page-core";
import { QueryPageComponent } from "@ramp/shared/ramp/query-page";
import { DescriptionComponent } from "@ramp/shared/ui/description-panel";
import { FeedbackPanelComponent } from "@ramp/shared/ui/feedback-panel";
import { Component } from "@angular/core";
import { CommonModule } from "@angular/common";

@Component({
selector: 'lib-features-ramp-reaction-classes-from-analytes',
standalone: true,
imports: [
CommonModule,
DescriptionComponent,
InputRowComponent,
FeedbackPanelComponent,
QueryPageComponent,
TitleCasePipe,
CommonModule
],
templateUrl: './features-ramp-reaction-classes-from-analytes.component.html',
styleUrl: './features-ramp-reaction-classes-from-analytes.component.scss',
})
export class FeaturesRampReactionClassesFromAnalytesComponent
extends PageCoreComponent
implements OnInit {
{

constructor(private ref: ChangeDetectorRef) {
super();
}

ngOnInit() {
}

}
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
// @ts-expect-error https://thymikee.github.io/jest-preset-angular/docs/getting-started/test-environment
globalThis.ngJest = {
testEnvironmentOptions: {
errorOnUnknownElements: true,
errorOnUnknownProperties: true,
errorOnUnknownElements: false,
errorOnUnknownProperties: false,
},
};
import 'jest-preset-angular/setup-jest';
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
<!--
<div class="content-panel">
<div class="row space-around-row">
<div class="full-width">
Expand Down Expand Up @@ -39,3 +40,4 @@ <h1 class="page-title">
>
</ramp-query-page>
</div>
-->
Original file line number Diff line number Diff line change
@@ -1,9 +1,5 @@
import { ComponentFixture, TestBed } from '@angular/core/testing';
import { BrowserAnimationsModule } from "@angular/platform-browser/animations";
import { provideEffects } from "@ngrx/effects";
import { provideStore, StoreModule } from "@ngrx/store";
import { provideStoreDevtools } from "@ngrx/store-devtools";
import { RampEffects, rampReducer } from "@ramp/stores/ramp-store";
import { ReactionsFromAnalytesComponent } from './features-ramp-reactions-from-analytes.component';

describe('ReactionsFromAnalytesComponent', () => {
Expand All @@ -14,23 +10,17 @@ describe('ReactionsFromAnalytesComponent', () => {
await TestBed.configureTestingModule({
imports: [
BrowserAnimationsModule,
ReactionsFromAnalytesComponent,
StoreModule
],
providers: [
provideStore({
rampStore: rampReducer
}),
provideEffects([RampEffects]),
provideStoreDevtools({ maxAge: 25, logOnly: false }),
], }).compileComponents();
ReactionsFromAnalytesComponent
]
}).compileComponents();

fixture = TestBed.createComponent(
ReactionsFromAnalytesComponent,
);
component = fixture.componentInstance;

fixture.detectChanges();
});
})

it('should create', () => {
expect(component).toBeTruthy();
Expand Down
Original file line number Diff line number Diff line change
@@ -1,33 +1,15 @@
import { ChangeDetectorRef, Component, OnInit } from "@angular/core";
import { CommonModule, TitleCasePipe } from "@angular/common";
import { InputRowComponent } from "@ramp/shared/ramp/input-row";
import { PageCoreComponent } from "@ramp/shared/ramp/page-core";
import { QueryPageComponent } from "@ramp/shared/ramp/query-page";
import { DescriptionComponent } from "@ramp/shared/ui/description-panel";
import { FeedbackPanelComponent } from "@ramp/shared/ui/feedback-panel";
import { Component } from "@angular/core";
import { CommonModule } from "@angular/common";

@Component({
selector: 'lib-features-ramp-reactions-from-analytes',
standalone: true,
imports: [
CommonModule,
DescriptionComponent,
InputRowComponent,
FeedbackPanelComponent,
QueryPageComponent,
TitleCasePipe,
CommonModule
],
templateUrl: './features-ramp-reactions-from-analytes.component.html',
styleUrl: './features-ramp-reactions-from-analytes.component.scss',
})
export class ReactionsFromAnalytesComponent
extends PageCoreComponent
implements OnInit
{
constructor(private ref: ChangeDetectorRef) {
super();
}
export class ReactionsFromAnalytesComponent {

ngOnInit() {
}
}
5 changes: 1 addition & 4 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"name": "ramp",
"name": "ramp-client",
"version": "0.0.0",
"license": "MIT",
"scripts": {
Expand Down Expand Up @@ -90,9 +90,6 @@
"ts-jest": "^29.1.2",
"ts-node": "^10.9.2",
"typescript": "5.3.3"
},
"nx": {
"targets": {}
}
}

Loading