From 4dbef3fcd7a14437d55c555cf10d50de8e50d7d1 Mon Sep 17 00:00:00 2001 From: ivarlovlie Date: Fri, 9 Dec 2022 11:57:12 +0900 Subject: feat: Move everything out of $lib --- code/app/src/lib/models/base/Customer.ts | 21 --------------- code/app/src/lib/models/base/CustomerContact.ts | 8 ------ code/app/src/lib/models/base/CustomerEvent.ts | 6 ----- code/app/src/lib/models/base/SessionData.ts | 5 ---- code/app/src/lib/models/base/Tenant.ts | 8 ------ code/app/src/lib/models/base/User.ts | 13 ---------- code/app/src/lib/models/base/UserRole.ts | 5 ---- code/app/src/lib/models/internal/FormError.ts | 24 ----------------- code/app/src/lib/models/internal/ISession.ts | 8 ------ code/app/src/lib/models/internal/KnownProblem.ts | 10 -------- code/app/src/lib/models/projects/Project.ts | 13 ---------- code/app/src/lib/models/projects/ProjectLabel.ts | 5 ---- code/app/src/lib/models/projects/ProjectMember.ts | 10 -------- code/app/src/lib/models/projects/ProjectMeta.ts | 7 ----- code/app/src/lib/models/projects/ProjectRole.ts | 7 ----- code/app/src/lib/models/projects/ProjectStatus.ts | 5 ---- code/app/src/lib/models/work/WorkCategory.ts | 5 ---- code/app/src/lib/models/work/WorkEntry.ts | 13 ---------- .../src/lib/models/work/WorkEntryQueryResponse.ts | 27 ------------------- code/app/src/lib/models/work/WorkLabel.ts | 5 ---- code/app/src/lib/models/work/WorkQuery.ts | 30 ---------------------- 21 files changed, 235 deletions(-) delete mode 100644 code/app/src/lib/models/base/Customer.ts delete mode 100644 code/app/src/lib/models/base/CustomerContact.ts delete mode 100644 code/app/src/lib/models/base/CustomerEvent.ts delete mode 100644 code/app/src/lib/models/base/SessionData.ts delete mode 100644 code/app/src/lib/models/base/Tenant.ts delete mode 100644 code/app/src/lib/models/base/User.ts delete mode 100644 code/app/src/lib/models/base/UserRole.ts delete mode 100644 code/app/src/lib/models/internal/FormError.ts delete mode 100644 code/app/src/lib/models/internal/ISession.ts delete mode 100644 code/app/src/lib/models/internal/KnownProblem.ts delete mode 100644 code/app/src/lib/models/projects/Project.ts delete mode 100644 code/app/src/lib/models/projects/ProjectLabel.ts delete mode 100644 code/app/src/lib/models/projects/ProjectMember.ts delete mode 100644 code/app/src/lib/models/projects/ProjectMeta.ts delete mode 100644 code/app/src/lib/models/projects/ProjectRole.ts delete mode 100644 code/app/src/lib/models/projects/ProjectStatus.ts delete mode 100644 code/app/src/lib/models/work/WorkCategory.ts delete mode 100644 code/app/src/lib/models/work/WorkEntry.ts delete mode 100644 code/app/src/lib/models/work/WorkEntryQueryResponse.ts delete mode 100644 code/app/src/lib/models/work/WorkLabel.ts delete mode 100644 code/app/src/lib/models/work/WorkQuery.ts (limited to 'code/app/src/lib/models') diff --git a/code/app/src/lib/models/base/Customer.ts b/code/app/src/lib/models/base/Customer.ts deleted file mode 100644 index e44ebb6..0000000 --- a/code/app/src/lib/models/base/Customer.ts +++ /dev/null @@ -1,21 +0,0 @@ -import type { CustomerContact } from "./CustomerContact" -import type { User } from "./User" - -export type Customer = { - /** - * Guid id for customer - */ - id: string, - /** - * The name of the company - */ - name: string, - /** - * Responsible contact in the current tenant - */ - tenantContact: User, - /** - * The customers main contact - */ - mainContact: CustomerContact, -} \ No newline at end of file diff --git a/code/app/src/lib/models/base/CustomerContact.ts b/code/app/src/lib/models/base/CustomerContact.ts deleted file mode 100644 index e8abea5..0000000 --- a/code/app/src/lib/models/base/CustomerContact.ts +++ /dev/null @@ -1,8 +0,0 @@ -export type CustomerContact = { - firstName: string, - lastname: string, - email: string, - phone: string, - workTitle: string, - note: string -} \ No newline at end of file diff --git a/code/app/src/lib/models/base/CustomerEvent.ts b/code/app/src/lib/models/base/CustomerEvent.ts deleted file mode 100644 index af86511..0000000 --- a/code/app/src/lib/models/base/CustomerEvent.ts +++ /dev/null @@ -1,6 +0,0 @@ -export type CustomerEvent = { - /** - * A descriptive name for the occured event - */ - name: string, -} \ No newline at end of file diff --git a/code/app/src/lib/models/base/SessionData.ts b/code/app/src/lib/models/base/SessionData.ts deleted file mode 100644 index 015cbf3..0000000 --- a/code/app/src/lib/models/base/SessionData.ts +++ /dev/null @@ -1,5 +0,0 @@ -export type SessionData = { - id: string, - username: string, - displayName: string, -} \ No newline at end of file diff --git a/code/app/src/lib/models/base/Tenant.ts b/code/app/src/lib/models/base/Tenant.ts deleted file mode 100644 index 983122b..0000000 --- a/code/app/src/lib/models/base/Tenant.ts +++ /dev/null @@ -1,8 +0,0 @@ -import type { User } from "./User" - -export type Tenant = { - id: string, - name: string, - description: string, - masterUser: User, -} \ No newline at end of file diff --git a/code/app/src/lib/models/base/User.ts b/code/app/src/lib/models/base/User.ts deleted file mode 100644 index 371c38e..0000000 --- a/code/app/src/lib/models/base/User.ts +++ /dev/null @@ -1,13 +0,0 @@ -import type { UserRole } from "./UserRole" - -export type User = { - /** - * Guid id for user - */ - id: string, - firstName: string, - lastName: string, - role: UserRole, - username: string, - email: string -} \ No newline at end of file diff --git a/code/app/src/lib/models/base/UserRole.ts b/code/app/src/lib/models/base/UserRole.ts deleted file mode 100644 index ec32852..0000000 --- a/code/app/src/lib/models/base/UserRole.ts +++ /dev/null @@ -1,5 +0,0 @@ -export enum UserRole { - REGULAR = "reg", - ADMINISTRATOR = "adm", - OWNER = "own" -} \ No newline at end of file diff --git a/code/app/src/lib/models/internal/FormError.ts b/code/app/src/lib/models/internal/FormError.ts deleted file mode 100644 index f6d8978..0000000 --- a/code/app/src/lib/models/internal/FormError.ts +++ /dev/null @@ -1,24 +0,0 @@ -import type { KnownProblem } from "./KnownProblem"; - -export class FormError { - title: string; - subtitle: string; - constructor(title: string = "", subtitle: string = "") { - this.title = title; - this.title = subtitle; - } - - set(title: string = "", subtitle: string = "") { - this.title = title; - this.subtitle = subtitle; - } - - set_from_known_problem(knownProblem: KnownProblem) { - this.title = knownProblem.title ?? ""; - this.subtitle = knownProblem.subtitle ?? ""; - } - - has_error() { - return this.title?.length > 0 || this.subtitle?.length > 0; - } -} \ No newline at end of file diff --git a/code/app/src/lib/models/internal/ISession.ts b/code/app/src/lib/models/internal/ISession.ts deleted file mode 100644 index a452e20..0000000 --- a/code/app/src/lib/models/internal/ISession.ts +++ /dev/null @@ -1,8 +0,0 @@ -export type Session = { - profile: { - username: string, - displayName: string, - id: string, - }, - lastChecked: number, -} \ No newline at end of file diff --git a/code/app/src/lib/models/internal/KnownProblem.ts b/code/app/src/lib/models/internal/KnownProblem.ts deleted file mode 100644 index b6923d9..0000000 --- a/code/app/src/lib/models/internal/KnownProblem.ts +++ /dev/null @@ -1,10 +0,0 @@ -export type KnownProblem = { - title: string, - subtitle: string, - errors: Record, - traceId: string, -} - -export function is_known_problem(response: Response): boolean { - return response.headers.has("X-IsKnownProblem"); -} \ No newline at end of file diff --git a/code/app/src/lib/models/projects/Project.ts b/code/app/src/lib/models/projects/Project.ts deleted file mode 100644 index f265e67..0000000 --- a/code/app/src/lib/models/projects/Project.ts +++ /dev/null @@ -1,13 +0,0 @@ -import type { Temporal } from "temporal-polyfill" -import type { ProjectMember } from "./ProjectMember" -import type { ProjectStatus } from "./ProjectStatus" - -export type Project = { - id: string, - name: string, - description?: string, - start: Temporal.PlainDate, - stop?: Temporal.PlainDate, - members: Array, - status: ProjectStatus -} \ No newline at end of file diff --git a/code/app/src/lib/models/projects/ProjectLabel.ts b/code/app/src/lib/models/projects/ProjectLabel.ts deleted file mode 100644 index 59aa9d5..0000000 --- a/code/app/src/lib/models/projects/ProjectLabel.ts +++ /dev/null @@ -1,5 +0,0 @@ -export type ProjectLabel = { - id: string, - name: string, - color: string -} \ No newline at end of file diff --git a/code/app/src/lib/models/projects/ProjectMember.ts b/code/app/src/lib/models/projects/ProjectMember.ts deleted file mode 100644 index de348ef..0000000 --- a/code/app/src/lib/models/projects/ProjectMember.ts +++ /dev/null @@ -1,10 +0,0 @@ -import type { ProjectRole } from "./ProjectRole" - -export type ProjectMember = { - id: string, - name: string, - role: ProjectRole, - email: string, - userId?: string, - customerId?: string -} \ No newline at end of file diff --git a/code/app/src/lib/models/projects/ProjectMeta.ts b/code/app/src/lib/models/projects/ProjectMeta.ts deleted file mode 100644 index c583b47..0000000 --- a/code/app/src/lib/models/projects/ProjectMeta.ts +++ /dev/null @@ -1,7 +0,0 @@ -import type { Temporal } from "temporal-polyfill" -import type { User } from "../base/User" - -export type ProjectMeta = { - created: Temporal.PlainDateTime, - createdBy: User, -} \ No newline at end of file diff --git a/code/app/src/lib/models/projects/ProjectRole.ts b/code/app/src/lib/models/projects/ProjectRole.ts deleted file mode 100644 index 0fa2347..0000000 --- a/code/app/src/lib/models/projects/ProjectRole.ts +++ /dev/null @@ -1,7 +0,0 @@ -export enum ProjectRole { - EXTERNAL = "ext", - INTERNAL = "int", - RESOURCE = "res", - MANAGER = "man", - OWNER = "own" -} \ No newline at end of file diff --git a/code/app/src/lib/models/projects/ProjectStatus.ts b/code/app/src/lib/models/projects/ProjectStatus.ts deleted file mode 100644 index 2df4b88..0000000 --- a/code/app/src/lib/models/projects/ProjectStatus.ts +++ /dev/null @@ -1,5 +0,0 @@ -export enum ProjectStatus { - ACTIVE = "act", - EXPIRED = "exp", - IDLE = "idl" -} \ No newline at end of file diff --git a/code/app/src/lib/models/work/WorkCategory.ts b/code/app/src/lib/models/work/WorkCategory.ts deleted file mode 100644 index 7dd85d5..0000000 --- a/code/app/src/lib/models/work/WorkCategory.ts +++ /dev/null @@ -1,5 +0,0 @@ -export type WorkCategory = { - id: string, - name: string, - color: string -} diff --git a/code/app/src/lib/models/work/WorkEntry.ts b/code/app/src/lib/models/work/WorkEntry.ts deleted file mode 100644 index 2108b88..0000000 --- a/code/app/src/lib/models/work/WorkEntry.ts +++ /dev/null @@ -1,13 +0,0 @@ -import type { WorkLabel } from "./WorkLabel"; -import type { WorkCategory } from "./WorkCategory"; -import type { Project } from "../projects/Project"; - -export type WorkEntry = { - id: string, - start: string, - stop: string, - description: string, - labels?: Array, - category?: WorkCategory, - project?: Project -} diff --git a/code/app/src/lib/models/work/WorkEntryQueryResponse.ts b/code/app/src/lib/models/work/WorkEntryQueryResponse.ts deleted file mode 100644 index a6974f1..0000000 --- a/code/app/src/lib/models/work/WorkEntryQueryResponse.ts +++ /dev/null @@ -1,27 +0,0 @@ -import type { WorkCategory } from "./WorkCategory"; -import type { WorkLabel } from "./WorkLabel"; -import type { Temporal } from "temporal-polyfill"; - -export interface WorkEntryQueryResponse { - duration: WorkEntryQueryDuration, - categories?: Array, - labels?: Array, - dateRange?: WorkEntryQueryDateRange, - specificDate?: Temporal.PlainDateTime - page: number, - pageSize: number -} - -export interface WorkEntryQueryDateRange { - from: Temporal.PlainDateTime, - to: Temporal.PlainDateTime -} - -export enum WorkEntryQueryDuration { - TODAY = 0, - THIS_WEEK = 1, - THIS_MONTH = 2, - THIS_YEAR = 3, - SPECIFIC_DATE = 4, - DATE_RANGE = 5, -} diff --git a/code/app/src/lib/models/work/WorkLabel.ts b/code/app/src/lib/models/work/WorkLabel.ts deleted file mode 100644 index f7e2795..0000000 --- a/code/app/src/lib/models/work/WorkLabel.ts +++ /dev/null @@ -1,5 +0,0 @@ -export interface WorkLabel { - id?: string, - name?: string, - color?: string -} diff --git a/code/app/src/lib/models/work/WorkQuery.ts b/code/app/src/lib/models/work/WorkQuery.ts deleted file mode 100644 index bccc589..0000000 --- a/code/app/src/lib/models/work/WorkQuery.ts +++ /dev/null @@ -1,30 +0,0 @@ -import type { HourEntry } from "./WorkEntry"; -import type { IValidationResult } from "../internal/IValidationResult"; -import ValidationResult from "../internal/IValidationResult"; - -export interface IWorkQuery { - results: Array, - page: number, - pageSize: number, - totalRecords: number, - totalPageCount: number, - is_valid: Function -} - -export class WorkQuery implements IWorkQuery { - results: HourEntry[]; - page: number; - pageSize: number; - totalRecords: number; - totalPageCount: number; - - is_valid(): IValidationResult { - const result = new ValidationResult(); - if (this.page < 0) { - result.add_error("page", { - title: "Page cannot be less than zero", - }) - } - return result; - } -} -- cgit v1.3