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

Report handler #31

Merged
merged 15 commits into from
Sep 27, 2020
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
165 changes: 163 additions & 2 deletions angular.json
Original file line number Diff line number Diff line change
Expand Up @@ -24,9 +24,19 @@
"styles": [
"node_modules/bootstrap/dist/css/bootstrap.min.css",
"./node_modules/@angular/material/prebuilt-themes/pink-bluegrey.css",
"apps/sample-platform/src/styles.css"
"apps/sample-platform/src/styles.scss",
"node_modules/@fortawesome/fontawesome-free/scss/fontawesome.scss",
"node_modules/@fortawesome/fontawesome-free/scss/solid.scss",
"node_modules/@fortawesome/fontawesome-free/scss/regular.scss",
"node_modules/@fortawesome/fontawesome-free/scss/brands.scss",
"node_modules/angular-bootstrap-md/assets/scss/bootstrap/bootstrap.scss",
"node_modules/angular-bootstrap-md/assets/scss/mdb.scss",
"node_modules/animate.css/animate.css"
],
"scripts": []
"scripts": [
"node_modules/chart.js/dist/Chart.js",
"node_modules/hammerjs/hammer.min.js"
]
},
"configurations": {
"production": {
Expand Down Expand Up @@ -530,6 +540,157 @@
"style": "scss"
}
}
},
"api-implementation-report": {
"root": "libs/api-implementation/report",
"sourceRoot": "libs/api-implementation/report/src",
"projectType": "library",
"schematics": {},
"architect": {
"lint": {
"builder": "@angular-devkit/build-angular:tslint",
"options": {
"tsConfig": [
"libs/api-implementation/report/tsconfig.lib.json",
"libs/api-implementation/report/tsconfig.spec.json"
],
"exclude": [
"**/node_modules/**",
"!libs/api-implementation/report/**"
]
}
},
"test": {
"builder": "@nrwl/jest:jest",
"options": {
"jestConfig": "libs/api-implementation/report/jest.config.js",
"tsConfig": "libs/api-implementation/report/tsconfig.spec.json",
"passWithNoTests": true
}
}
}
},
"api-implementation-test-entry": {
"root": "libs/api-implementation/test-entry",
"sourceRoot": "libs/api-implementation/test-entry/src",
"projectType": "library",
"schematics": {},
"architect": {
"lint": {
"builder": "@angular-devkit/build-angular:tslint",
"options": {
"tsConfig": [
"libs/api-implementation/test-entry/tsconfig.lib.json",
"libs/api-implementation/test-entry/tsconfig.spec.json"
],
"exclude": [
"**/node_modules/**",
"!libs/api-implementation/test-entry/**"
]
}
},
"test": {
"builder": "@nrwl/jest:jest",
"options": {
"jestConfig": "libs/api-implementation/test-entry/jest.config.js",
"tsConfig": "libs/api-implementation/test-entry/tsconfig.spec.json",
"passWithNoTests": true
}
}
}
},
"frontend-test-entry": {
"projectType": "library",
"root": "libs/frontend/test-entry",
"sourceRoot": "libs/frontend/test-entry/src",
"prefix": "frontend",
"architect": {
"lint": {
"builder": "@angular-devkit/build-angular:tslint",
"options": {
"tsConfig": [
"libs/frontend/test-entry/tsconfig.lib.json",
"libs/frontend/test-entry/tsconfig.spec.json"
],
"exclude": ["**/node_modules/**", "!libs/frontend/test-entry/**"]
}
},
"test": {
"builder": "@nrwl/jest:jest",
"options": {
"jestConfig": "libs/frontend/test-entry/jest.config.js",
"tsConfig": "libs/frontend/test-entry/tsconfig.spec.json",
"passWithNoTests": true,
"setupFile": "libs/frontend/test-entry/src/test-setup.ts"
}
}
},
"schematics": {
"@nrwl/angular:component": {
"style": "scss"
}
}
},
"api-implementation-test-run": {
"root": "libs/api-implementation/test-run",
"sourceRoot": "libs/api-implementation/test-run/src",
"projectType": "library",
"schematics": {},
"architect": {
"lint": {
"builder": "@angular-devkit/build-angular:tslint",
"options": {
"tsConfig": [
"libs/api-implementation/test-run/tsconfig.lib.json",
"libs/api-implementation/test-run/tsconfig.spec.json"
],
"exclude": [
"**/node_modules/**",
"!libs/api-implementation/test-run/**"
]
}
},
"test": {
"builder": "@nrwl/jest:jest",
"options": {
"jestConfig": "libs/api-implementation/test-run/jest.config.js",
"tsConfig": "libs/api-implementation/test-run/tsconfig.spec.json",
"passWithNoTests": true
}
}
}
},
"frontend-test-runs": {
"projectType": "library",
"root": "libs/frontend/test-runs",
"sourceRoot": "libs/frontend/test-runs/src",
"prefix": "frontend",
"architect": {
"lint": {
"builder": "@angular-devkit/build-angular:tslint",
"options": {
"tsConfig": [
"libs/frontend/test-runs/tsconfig.lib.json",
"libs/frontend/test-runs/tsconfig.spec.json"
],
"exclude": ["**/node_modules/**", "!libs/frontend/test-runs/**"]
}
},
"test": {
"builder": "@nrwl/jest:jest",
"options": {
"jestConfig": "libs/frontend/test-runs/jest.config.js",
"tsConfig": "libs/frontend/test-runs/tsconfig.spec.json",
"passWithNoTests": true,
"setupFile": "libs/frontend/test-runs/src/test-setup.ts"
}
}
},
"schematics": {
"@nrwl/angular:component": {
"style": "scss"
}
}
}
},
"cli": {
Expand Down
17 changes: 14 additions & 3 deletions apps/api/src/app/app.module.ts
Original file line number Diff line number Diff line change
@@ -1,17 +1,28 @@
import { Module } from '@nestjs/common';
import { Module, HttpModule } from '@nestjs/common';

import { AppController } from './app.controller';
//TODO: fix the naming so that prefix import will work
import { VMOrchestrationModule } from '../../../../libs/api-implementation/orchestration/src';
import { ApiImplementationRegressionTestsModule } from '@new-sample-platform/api-implementation/regression-tests';
import { ApiImplementationDatabaseModule } from '@new-sample-platform/api-implementation/database';
import { ApiImplementationSamplesModule } from '@new-sample-platform/api-implementation/samples'
import { ApiImplementationSamplesModule } from '@new-sample-platform/api-implementation/samples';
import { ApiImplementationReportModule } from '@new-sample-platform/api-implementation/report';
import { ApiImplementationTestEntryModule } from '@new-sample-platform/api-implementation/test-entry';
import { ApiImplementationXmlModule } from '@new-sample-platform/api-implementation/xml';
import { ApiImplementationTestRunModule } from '@new-sample-platform/api-implementation/test-run';
import { HttpAdapterHost } from '@nestjs/core';

@Module({
imports: [
HttpAdapterHost,
VMOrchestrationModule,
ApiImplementationTestRunModule,
ApiImplementationXmlModule,
ApiImplementationTestEntryModule,
ApiImplementationReportModule,
ApiImplementationRegressionTestsModule,
ApiImplementationDatabaseModule,
ApiImplementationSamplesModule
ApiImplementationSamplesModule,
],
controllers: [AppController],
providers: [],
Expand Down
2 changes: 1 addition & 1 deletion apps/api/tsconfig.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"compilerOptions": {
"types": ["node", "jest"],
"emitDecoratorMetadata": true,
"target": "es2015"
"target": "es6"
},
"include": ["**/*.ts"]
}
2 changes: 1 addition & 1 deletion apps/github-interactions-api/tsconfig.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"compilerOptions": {
"types": ["node", "jest"],
"emitDecoratorMetadata": true,
"target": "es2015"
"target": "es6"
},
"include": ["**/*.ts"]
}
2 changes: 1 addition & 1 deletion apps/sample-platform/proxy.conf.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"/api/*": {
"/api": {
"target": "http://localhost:3333",
"secure": false,
"changeOrigin": true,
Expand Down
5 changes: 5 additions & 0 deletions apps/sample-platform/src/app/app.component.css
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
.logo {
/* height: 10%; */
width: 10%;
/* float: right; */
}
37 changes: 37 additions & 0 deletions apps/sample-platform/src/app/app.component.html
Original file line number Diff line number Diff line change
@@ -1,3 +1,40 @@
<!--Navbar-->
<mdb-navbar SideClass="navbar navbar-expand-lg navbar-dark pink">

<!-- Navbar brand -->
<mdb-navbar-brand><a class="navbar-brand" href="https://ccextractor.org/"></a></mdb-navbar-brand>

<!-- Collapsible content -->
<links>

<!-- Links -->
<ul class="navbar-nav mr-auto">
<li class="nav-item active">
<a class="nav-link waves-light" mdbWavesEffect>Home<span class="sr-only">(current)</span></a>
</li>
<li class="nav-item">
<a class="nav-link waves-light" href="http://localhost:4200/test-entry/create" mdbWavesEffect>Create test</a>
</li>
<li class="nav-item">
<a class="nav-link waves-light" href="http://localhost:4200/test-runs/list" mdbWavesEffect>Test results</a>
</li>
<li class="nav-item">
<a class="nav-link waves-light" href="http://localhost:4200/samples/upload" mdbWavesEffect>Upload sample</a>
</li>



</ul>
<!-- Links -->

<!-- <form class="form-inline waves-light" mdbWavesEffect> -->

<!-- </form> -->
</links>
<!-- Collapsible content -->

</mdb-navbar>
<!--/.Navbar-->
<div>
<router-outlet></router-outlet>
</div>
2 changes: 2 additions & 0 deletions apps/sample-platform/src/app/app.module.ts
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ import { MatIconModule } from '@angular/material/icon';
import { MatButtonModule } from '@angular/material/button';
import { FormsModule } from '@angular/forms';
import { NgbModule } from '@ng-bootstrap/ng-bootstrap';
import { MDBBootstrapModule } from 'angular-bootstrap-md';

@NgModule({
declarations: [AppComponent],
Expand All @@ -27,6 +28,7 @@ import { NgbModule } from '@ng-bootstrap/ng-bootstrap';
MatButtonModule,
FormsModule,
NgbModule,
MDBBootstrapModule.forRoot(),
],
providers: [],
bootstrap: [AppComponent],
Expand Down
26 changes: 18 additions & 8 deletions apps/sample-platform/src/app/routing.module.ts
Original file line number Diff line number Diff line change
@@ -1,25 +1,35 @@
import { NgModule } from '@angular/core';
import {
PreloadAllModules,
RouterModule,
Routes,
} from '@angular/router';
import { PreloadAllModules, RouterModule, Routes } from '@angular/router';

const routes: Routes = [
{
path: 'tests',
loadChildren: () =>
import('@new-sample-platform/frontend/regression-test').then(
(mod) => mod.FrontendRegressionTestModule
)
),
},
{
path: 'samples',
loadChildren: () =>
import('@new-sample-platform/frontend/samples').then(
(mod) => mod.FrontendSamplesModule
)
}
),
},
{
path: 'test-entry',
loadChildren: () =>
import('@new-sample-platform/frontend/test-entry').then(
(mod) => mod.FrontendTestEntryModule
),
},
{
path: 'test-runs',
loadChildren: () =>
import('@new-sample-platform/frontend/test-runs').then(
(mod) => mod.FrontendTestRunsModule
),
},
];

@NgModule({
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
/* You can add global styles to this file, and also import other style files */

html, body { height: 100%; }
body { margin: 0; font-family: Roboto, "Helvetica Neue", sans-serif; background-color: aliceblue;}
body { margin: 0; font-family: Roboto, "Helvetica Neue", sans-serif; background-color: white;}
4 changes: 3 additions & 1 deletion config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -5,5 +5,7 @@ export enum AppConfig {
CCEXTRACTOR_REPO_NAME = "ccextractor",
CCEXTRACTOR_REPO_OWNER = "zelzhan",
MONGO_CONNECTION_STRING = "mongodb://mongo:27017/test",
PATH_TO_MOUNTED_BUCKET = "/path/to/bucket/"
PATH_TO_MOUNTED_BUCKET = "/path/to/bucket/",
EXTERNAL_IP = "http://192.168.0.1:2000",
VM_ZONE = "us-central1-c"
}
4 changes: 4 additions & 0 deletions libs/api-implementation/models/file/file.models.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
import { model } from 'mongoose';
import { IFileDocument } from './file.types';
import FileSchema from './file.schema';
export const FileModel: model = model<IFileDocument>('file', FileSchema);
13 changes: 13 additions & 0 deletions libs/api-implementation/models/file/file.schema.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
import { Schema } from 'mongoose';

const FileSchema = new Schema({
filename: {
type: String,
required: true,
},
buffer: {
type: Buffer,
required: true,
},
});
export default FileSchema;
10 changes: 10 additions & 0 deletions libs/api-implementation/models/file/file.types.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
import { Document, Model } from 'mongoose';

export interface IFile {
filename: String;
dateOfEntry?: Date;
lastUpdated?: Date;
}

export interface IFileDocument extends IFile, Document {}
export interface IFileModel extends Model<IFileDocument> {}
Loading