Skip to content

Commit

Permalink
Merge branch 'dev' into dependabot/npm_and_yarn/multi-d66d039ac5
Browse files Browse the repository at this point in the history
  • Loading branch information
vktrrdk committed Sep 18, 2024
2 parents 6692ef7 + f7b8c3a commit 9acafda
Show file tree
Hide file tree
Showing 127 changed files with 646 additions and 20,117 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/LintingAutoFix.yml
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ jobs:
- name: Create Pull Request
if: steps.git-check.outputs.modified == 'true'
id: cpr
uses: peter-evans/[email protected].0
uses: peter-evans/[email protected].3
with:
token: ${{ secrets.GITHUB_TOKEN }}
commit-message: fix(Linting):blacked code
Expand Down
565 changes: 299 additions & 266 deletions package-lock.json

Large diffs are not rendered by default.

59 changes: 29 additions & 30 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@denbi/cloud-portal-webapp",
"version": "4.873.0",
"version": "4.879.0",
"description": "de.NBI Cloud Portal",
"scripts": {
"ng": "ng serve",
Expand All @@ -19,23 +19,23 @@
"private": true,
"dependencies": {
"@angular-eslint/eslint-plugin": "^18.3.0",
"@angular/animations": "18.2.2",
"@angular/cdk": "18.2.2",
"@angular/common": "18.2.2",
"@angular/compiler": "18.2.2",
"@angular/core": "18.2.2",
"@angular/forms": "18.2.2",
"@angular/localize": "18.2.2",
"@angular/platform-browser": "18.2.2",
"@angular/platform-browser-dynamic": "18.2.2",
"@angular/router": "18.2.2",
"@angular/service-worker": "18.2.2",
"@angular/upgrade": "18.2.2",
"@angular/animations": "18.2.4",
"@angular/cdk": "18.2.4",
"@angular/common": "18.2.4",
"@angular/compiler": "18.2.4",
"@angular/core": "18.2.4",
"@angular/forms": "18.2.4",
"@angular/localize": "18.2.4",
"@angular/platform-browser": "18.2.4",
"@angular/platform-browser-dynamic": "18.2.4",
"@angular/router": "18.2.4",
"@angular/service-worker": "18.2.4",
"@angular/upgrade": "18.2.4",
"@coreui/angular": "5.2.17",
"@coreui/coreui": "5.1.2",
"@coreui/icons-angular": "5.2.17",
"@ng-bootstrap/ng-bootstrap": "17.0.1",
"@ng-select/ng-select": "13.7.0",
"@ng-select/ng-select": "13.7.1",
"@sindresorhus/transliterate": "1.6.0",
"@types/d3": "7.4.3",
"@types/jquery": "3.5.30",
Expand All @@ -48,24 +48,23 @@
"cli-color": "2.0.4",
"core-js": "3.38.1",
"css-loader": "7.1.2",
"cssnano": "7.0.5",
"cssnano": "7.0.6",
"d3": "7.9.0",
"export-to-csv": "1.4.0",
"file-saver": "2.0.5",
"follow-redirects": "1.15.8",
"follow-redirects": "1.15.9",
"html2canvas": "1.4.1",
"is-promise": "4.0.0",
"jsnlog": "2.30.0",
"jspdf": "2.5.1",
"keypairs": "1.2.14",
"keypairs": "1.2.14",
"mime": "4.0.4",
"moment": "2.30.1",
"ng2-charts": "5.0.4",
"ng2-charts": "6.0.1",
"ng2-cookies": "1.0.12",
"ngx-bootstrap": "18.0.2",
"ngx-clipboard": "16.0.0",
"ngx-cookie-service": "18.0.0",
"ngx-matomo-client": "6.3.0",
"ngx-matomo-client": "6.3.1",
"ngx-owl-carousel-o": "18.0.0",
"ngx-scrollbar": "15.1.3",
"postcss-loader": "8.1.1",
Expand All @@ -80,37 +79,37 @@
},
"devDependencies": {
"@angular-devkit/build-angular": "^18.1.4",
"@angular-eslint/builder": "18.3.0",
"@angular-eslint/eslint-plugin-template": "18.3.0",
"@angular-eslint/schematics": "18.3.0",
"@angular-eslint/template-parser": "18.3.0",
"@angular-eslint/builder": "18.3.1",
"@angular-eslint/eslint-plugin-template": "18.3.1",
"@angular-eslint/schematics": "18.3.1",
"@angular-eslint/template-parser": "18.3.1",
"@angular/cli": "^18.1.4",
"@angular/compiler-cli": "18.2.2",
"@angular/compiler-cli": "18.2.4",
"@eslint/eslintrc": "^3.1.0",
"@eslint/js": "^9.9.0",
"@playwright/test": "1.46.1",
"@playwright/test": "1.47.1",
"@types/jasmine": "5.1.4",
"@types/node": "20.16.4",
"@types/node": "20.16.5",
"@typescript-eslint/eslint-plugin": "^8.0.0",
"@typescript-eslint/parser": "^8.0.0",
"async": "3.2.6",
"audit-ci": "7.1.0",
"autoprefixer": "10.4.20",
"eslint": "^9.0.0",
"eslint-plugin-jsdoc": "50.2.2",
"eslint-plugin-jsdoc": "50.2.3",
"eslint-plugin-no-null": "latest",
"eslint-plugin-prefer-arrow": "1.2.3",
"exports-loader": "5.0.0",
"file-loader": "6.2.0",
"html-webpack-plugin": "5.6.0",
"husky": "9.1.5",
"husky": "9.1.6",
"json-loader": "0.5.7",
"karma": "6.4.4",
"karma-chrome-launcher": "3.2.0",
"less-loader": "12.2.0",
"lint-staged": "15.2.10",
"ngx-spec": "2.1.6",
"npm-run-all2": "6.2.2",
"npm-run-all2": "6.2.3",
"prettier": "3.3.3",
"raw-loader": "4.0.2",
"sass-loader": "16.0.1",
Expand Down
86 changes: 0 additions & 86 deletions src/app/api-connector/bioconda.service.ts

This file was deleted.

98 changes: 0 additions & 98 deletions src/app/api-connector/facility.service.ts
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,6 @@ import { ResourceMachine } from '../facility_manager/resources/resource-machine'
import { ProjectMember } from '../projectmanagement/project_member.model'
import { GPUSpecification } from '../facility_manager/resources/gpu-specification'
import { GeneralStorageFactor } from '../facility_manager/resources/general-storage-factor'
import { ClusterPage } from '../virtualmachines/clusters/clusterPage.model'
import { VolumePage } from '../virtualmachines/volumes/volumePage.model'
import { SnapshotPage } from '../virtualmachines/snapshots/snapshotPage.model'

/**
* Service which provides methods for the facilities.
Expand Down Expand Up @@ -80,38 +77,6 @@ export class FacilityService {
)
}

getClustersFacility(
facility_id: string,
page: number,
vm_per_site: number,
filter?: string,
filter_status?: string[]
): Observable<ClusterPage> {
let params: HttpParams = new HttpParams()
.set('page', page.toString())
.set('cluster_per_site', vm_per_site.toString())

if (filter) {
params = params.set('filter', filter)
}
if (filter_status) {
params = params.append('filter_status', JSON.stringify(filter_status))
}

return this.http
.get<ClusterPage>(`${ApiSettings.getApiBaseURL()}computecenters/${facility_id}/clusters/`, {
withCredentials: true,
params
})
.pipe(map((cluster_page: ClusterPage): ClusterPage => new ClusterPage(cluster_page)))
}

getComputeCenterClientLimits(facility_id): Observable<any> {
return this.http.get(`${ApiSettings.getApiBaseURL()}computecenters/${facility_id}/simpleVM/limits/`, {
withCredentials: true
})
}

getComputeCenterClientLimitsAvailable(facility_id, application_id): Observable<any> {
return this.http.get(
`${ApiSettings.getApiBaseURL()}computecenters/${facility_id}/simpleVM/${application_id}/limits/`,
Expand Down Expand Up @@ -284,69 +249,6 @@ export class FacilityService {
)
}

/**
* Gets all volumes from a specific facility.
*
* @param facility
* @returns
*/
getFacilityVolumes(facility: number | string, items_per_page: number, current_page: number): Observable<VolumePage> {
const params: HttpParams = new HttpParams()
.set('items_per_page', items_per_page.toString())
.set('page', current_page.toString())

return this.http
.get<VolumePage>(`${ApiSettings.getApiBaseURL()}computecenters/${facility}/volumes/`, {
withCredentials: true,
params
})
.pipe(map((volume_page: VolumePage): VolumePage => new VolumePage(volume_page)))
}

/**
* Gets all volumes from a specific facility.
*
* @param facility
* @param currentPage
* @param snapsPerSite
* @returns
*/
getFacilitySnapshots(
facility: number | string,
currentPage: number,
snapsPerSite: number,
filter?: string
): Observable<SnapshotPage> {
let params: HttpParams = new HttpParams()
.set('page', currentPage.toString())
.set('snaps_per_site', snapsPerSite.toString())
if (filter) {
params = params.set('filter', filter)
}

return this.http
.get<SnapshotPage>(`${ApiSettings.getApiBaseURL()}computecenters/${facility}/snapshots/`, {
withCredentials: true,
params
})
.pipe(map((snapshot_page: SnapshotPage): SnapshotPage => new SnapshotPage(snapshot_page)))
}

/**
* Gets all facility modification applications which are waiting for conirmation.
*
* @param facility
* @returns
*/
getFacilityModificationApplicationsWaitingForConfirmation(facility: number | string): Observable<Application[]> {
return this.http.get<Application[]>(
`${ApiSettings.getApiBaseURL()}computecenters/${facility}/modification_applications/`,
{
withCredentials: true
}
)
}

/**
* Approves an facility application.
*
Expand Down
Loading

0 comments on commit 9acafda

Please sign in to comment.