diff --git a/package-lock.json b/package-lock.json index 91c46d5d5f5219d61a5c0cf9982c5c0edc9d2710..47f82e746bbd8b871712c8b14ebb254f3d39adac 100644 --- a/package-lock.json +++ b/package-lock.json @@ -9092,21 +9092,6 @@ "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==", "dev": true }, - "kypo-common": { - "version": "10.0.0", - "resolved": "https://nexus.csirt.muni.cz/repository/kypo-npm-group/kypo-common/-/kypo-common-10.0.0.tgz", - "integrity": "sha512-IpFj3GBFVgMaXZ2vvToT0xouaKwDKgkR2clL9NWralaU5QkarZtEy5N3GeMbRR5WUFvXF8Af0ycYI/TAM45/Pg==", - "requires": { - "tslib": "^2.0.0" - }, - "dependencies": { - "tslib": { - "version": "2.0.0", - "resolved": "https://nexus.csirt.muni.cz/repository/kypo-npm-group/tslib/-/tslib-2.0.0.tgz", - "integrity": "sha512-lTqkx847PI7xEDYJntxZH89L2/aXInsyF2luSafe/+0fHOMjlBNXdH6th7f70qxLDhul7KZK0zC8V5ZIyHl0/g==" - } - } - }, "latest-version": { "version": "5.1.0", "resolved": "http://kypo-storage.ics.muni.cz:8081/repository/npm-group/latest-version/-/latest-version-5.1.0.tgz", diff --git a/package.json b/package.json index af269c2fc825a5e1bfd824da351b9a02b9295c0d..19fdb41ef3d637f3b98a98b4f66e896f2e62a3cc 100644 --- a/package.json +++ b/package.json @@ -27,7 +27,6 @@ "@angular/platform-browser": "~10.0.0", "@angular/platform-browser-dynamic": "~10.0.0", "@angular/router": "~10.0.0", - "kypo-common": "~10.0.0", "rxjs": "~6.5.4", "tslib": "^2.0.0", "zone.js": "~0.10.2" diff --git a/projects/kypo-sandbox-model/package.json b/projects/kypo-sandbox-model/package.json index 08e6774bf1063a65c8e094178dfcca1387ca8e67..7d3ead41c2fe927eb005858f8f708f8705462dd0 100644 --- a/projects/kypo-sandbox-model/package.json +++ b/projects/kypo-sandbox-model/package.json @@ -3,8 +3,7 @@ "version": "10.1.0", "peerDependencies": { "@angular/common": "^10.0.0", - "@angular/core": "^10.0.0", - "kypo-common": "~10.0.0" + "@angular/core": "^10.0.0" }, "dependencies": { "tslib": "^2.0.0" diff --git a/projects/kypo-sandbox-model/src/lib/pool-request/request.ts b/projects/kypo-sandbox-model/src/lib/pool-request/request.ts index 7a421746abab438667e02cc9c45569aeff509447..278c5caab4bd3ecce80b9ac1108f2c18441c2cac 100644 --- a/projects/kypo-sandbox-model/src/lib/pool-request/request.ts +++ b/projects/kypo-sandbox-model/src/lib/pool-request/request.ts @@ -1,22 +1,13 @@ -import { KypoDateTimeFormatPipe } from 'kypo-common'; - /** * Class representing pool request */ export abstract class Request { id: number; allocationUnitId: number; - createdAtFormatted: string; + createdAt: Date; readonly type: string; - private _createdAt: Date; protected constructor(type: string) { this.type = type; } - - set createdAt(value: Date) { - this._createdAt = value; - const dateTimeFormatter = new KypoDateTimeFormatPipe('en-EN'); - this.createdAtFormatted = dateTimeFormatter.transform(value); - } } diff --git a/projects/kypo-sandbox-model/src/lib/pool-request/stage/networking-ansible-allocation-stage.ts b/projects/kypo-sandbox-model/src/lib/pool-request/stage/networking-ansible-allocation-stage.ts index cfe0247b8ae307836cb211992b3f0d8ed47074fb..d46bfcc7e9cdbb18475539b4e2beca8b02b71e68 100644 --- a/projects/kypo-sandbox-model/src/lib/pool-request/stage/networking-ansible-allocation-stage.ts +++ b/projects/kypo-sandbox-model/src/lib/pool-request/stage/networking-ansible-allocation-stage.ts @@ -1,4 +1,3 @@ -import { KypoPaginatedResource } from 'kypo-common'; import { RequestStageType } from '../../enums/request-stage-type.enum'; import { AllocationRequestStage } from './allocation-request-stage'; diff --git a/projects/kypo-sandbox-model/src/lib/pool-request/stage/user-ansible-allocation-stage.ts b/projects/kypo-sandbox-model/src/lib/pool-request/stage/user-ansible-allocation-stage.ts index a3cb41e817b969591feaa7b88178b10d8b411f51..55143b1d2dbec9464386194702b63953741cf91c 100644 --- a/projects/kypo-sandbox-model/src/lib/pool-request/stage/user-ansible-allocation-stage.ts +++ b/projects/kypo-sandbox-model/src/lib/pool-request/stage/user-ansible-allocation-stage.ts @@ -1,4 +1,3 @@ -import { KypoPaginatedResource } from 'kypo-common'; import { RequestStageType } from '../../enums/request-stage-type.enum'; import { AllocationRequestStage } from './allocation-request-stage';