Complete merge of main into branch

backend/app/api/static/docs/swagger.yaml

@@ -1010,8 +1010,12 @@ definitions:
     enum:
     - location
     - item
+    - location
+    - item
     type: string
     x-enum-varnames:
+    - EntityTypeLocation
+    - EntityTypeItem
     - ItemTypeLocation
     - ItemTypeItem
   repo.ItemUpdate:

docs/en/api/swagger-2.0.yaml

@@ -1010,8 +1010,12 @@ definitions:
     enum:
     - location
     - item
+    - location
+    - item
     type: string
     x-enum-varnames:
+    - EntityTypeLocation
+    - EntityTypeItem
     - ItemTypeLocation
     - ItemTypeItem
   repo.ItemUpdate:

frontend/lib/api/types/data-contracts.ts

@@ -24,11 +24,13 @@ export enum MaintenanceFilterStatus {
 }
 
 export enum ItemType {
+  EntityTypeLocation = "location",
+  EntityTypeItem = "item",
   ItemTypeLocation = "location",
   ItemTypeItem = "item",
 }
 
-export enum ItemfieldType {
+export enum EntityfieldType {
   TypeText = "text",
   TypeNumber = "number",
   TypeBoolean = "boolean",
@@ -85,8 +87,8 @@ export interface EntAttachment {
 }
 
 export interface EntAttachmentEdges {
-  /** Item holds the value of the item edge. */
+  /** Entity holds the value of the entity edge. */
-  item: EntItem;
+  entity: EntEntity;
   /** Thumbnail holds the value of the thumbnail edge. */
   thumbnail: EntAttachment;
 }
@@ -133,65 +135,7 @@ export interface EntAuthTokensEdges {
   user: EntUser;
 }
 
-export interface EntGroup {
+export interface EntEntity {
-  /** CreatedAt holds the value of the "created_at" field. */
-  created_at: string;
-  /** Currency holds the value of the "currency" field. */
-  currency: string;
-  /**
-   * Edges holds the relations/edges for other nodes in the graph.
-   * The values are being populated by the GroupQuery when eager-loading is set.
-   */
-  edges: EntGroupEdges;
-  /** ID of the ent. */
-  id: string;
-  /** Name holds the value of the "name" field. */
-  name: string;
-  /** UpdatedAt holds the value of the "updated_at" field. */
-  updated_at: string;
-}
-
-export interface EntGroupEdges {
-  /** InvitationTokens holds the value of the invitation_tokens edge. */
-  invitation_tokens: EntGroupInvitationToken[];
-  /** Items holds the value of the items edge. */
-  items: EntItem[];
-  /** Labels holds the value of the labels edge. */
-  labels: EntLabel[];
-  /** Locations holds the value of the locations edge. */
-  locations: EntLocation[];
-  /** Notifiers holds the value of the notifiers edge. */
-  notifiers: EntNotifier[];
-  /** Users holds the value of the users edge. */
-  users: EntUser[];
-}
-
-export interface EntGroupInvitationToken {
-  /** CreatedAt holds the value of the "created_at" field. */
-  created_at: string;
-  /**
-   * Edges holds the relations/edges for other nodes in the graph.
-   * The values are being populated by the GroupInvitationTokenQuery when eager-loading is set.
-   */
-  edges: EntGroupInvitationTokenEdges;
-  /** ExpiresAt holds the value of the "expires_at" field. */
-  expires_at: string;
-  /** ID of the ent. */
-  id: string;
-  /** Token holds the value of the "token" field. */
-  token: number[];
-  /** UpdatedAt holds the value of the "updated_at" field. */
-  updated_at: string;
-  /** Uses holds the value of the "uses" field. */
-  uses: number;
-}
-
-export interface EntGroupInvitationTokenEdges {
-  /** Group holds the value of the group edge. */
-  group: EntGroup;
-}
-
-export interface EntItem {
   /** Archived holds the value of the "archived" field. */
   archived: boolean;
   /** AssetID holds the value of the "asset_id" field. */
@@ -202,9 +146,9 @@ export interface EntItem {
   description: string;
   /**
    * Edges holds the relations/edges for other nodes in the graph.
-   * The values are being populated by the ItemQuery when eager-loading is set.
+   * The values are being populated by the EntityQuery when eager-loading is set.
    */
-  edges: EntItemEdges;
+  edges: EntEntityEdges;
   /** ID of the ent. */
   id: string;
   /** ImportRef holds the value of the "import_ref" field. */
@@ -239,8 +183,8 @@ export interface EntItem {
   sold_time: string;
   /** SoldTo holds the value of the "sold_to" field. */
   sold_to: string;
-  /** SyncChildItemsLocations holds the value of the "sync_child_items_locations" field. */
+  /** SyncChildEntitiesLocations holds the value of the "sync_child_entities_locations" field. */
-  sync_child_items_locations: boolean;
+  sync_child_entities_locations: boolean;
   /** UpdatedAt holds the value of the "updated_at" field. */
   updated_at: string;
   /** WarrantyDetails holds the value of the "warranty_details" field. */
@@ -249,26 +193,30 @@ export interface EntItem {
   warranty_expires: string;
 }
 
-export interface EntItemEdges {
+export interface EntEntityEdges {
   /** Attachments holds the value of the attachments edge. */
   attachments: EntAttachment[];
   /** Children holds the value of the children edge. */
-  children: EntItem[];
+  children: EntEntity[];
+  /** Entity holds the value of the entity edge. */
+  entity: EntEntity[];
   /** Fields holds the value of the fields edge. */
-  fields: EntItemField[];
+  fields: EntEntityField[];
   /** Group holds the value of the group edge. */
   group: EntGroup;
   /** Label holds the value of the label edge. */
   label: EntLabel[];
   /** Location holds the value of the location edge. */
-  location: EntLocation;
+  location: EntEntity;
   /** MaintenanceEntries holds the value of the maintenance_entries edge. */
   maintenance_entries: EntMaintenanceEntry[];
   /** Parent holds the value of the parent edge. */
-  parent: EntItem;
+  parent: EntEntity;
+  /** Type holds the value of the type edge. */
+  type: EntEntityType;
 }
 
-export interface EntItemField {
+export interface EntEntityField {
   /** BooleanValue holds the value of the "boolean_value" field. */
   boolean_value: boolean;
   /** CreatedAt holds the value of the "created_at" field. */
@@ -277,9 +225,9 @@ export interface EntItemField {
   description: string;
   /**
    * Edges holds the relations/edges for other nodes in the graph.
-   * The values are being populated by the ItemFieldQuery when eager-loading is set.
+   * The values are being populated by the EntityFieldQuery when eager-loading is set.
    */
-  edges: EntItemFieldEdges;
+  edges: EntEntityFieldEdges;
   /** ID of the ent. */
   id: string;
   /** Name holds the value of the "name" field. */
@@ -291,14 +239,103 @@ export interface EntItemField {
   /** TimeValue holds the value of the "time_value" field. */
   time_value: string;
   /** Type holds the value of the "type" field. */
-  type: ItemfieldType;
+  type: EntityfieldType;
   /** UpdatedAt holds the value of the "updated_at" field. */
   updated_at: string;
 }
 
-export interface EntItemFieldEdges {
+export interface EntEntityFieldEdges {
-  /** Item holds the value of the item edge. */
+  /** Entity holds the value of the entity edge. */
-  item: EntItem;
+  entity: EntEntity;
+}
+
+export interface EntEntityType {
+  /** Color holds the value of the "color" field. */
+  color: string;
+  /** CreatedAt holds the value of the "created_at" field. */
+  created_at: string;
+  /** Description holds the value of the "description" field. */
+  description: string;
+  /**
+   * Edges holds the relations/edges for other nodes in the graph.
+   * The values are being populated by the EntityTypeQuery when eager-loading is set.
+   */
+  edges: EntEntityTypeEdges;
+  /** Icon holds the value of the "icon" field. */
+  icon: string;
+  /** ID of the ent. */
+  id: string;
+  /** IsLocation holds the value of the "is_location" field. */
+  is_location: boolean;
+  /** Name holds the value of the "name" field. */
+  name: string;
+  /** UpdatedAt holds the value of the "updated_at" field. */
+  updated_at: string;
+}
+
+export interface EntEntityTypeEdges {
+  /** Entities holds the value of the entities edge. */
+  entities: EntEntity[];
+  /** Group holds the value of the group edge. */
+  group: EntGroup;
+}
+
+export interface EntGroup {
+  /** CreatedAt holds the value of the "created_at" field. */
+  created_at: string;
+  /** Currency holds the value of the "currency" field. */
+  currency: string;
+  /**
+   * Edges holds the relations/edges for other nodes in the graph.
+   * The values are being populated by the GroupQuery when eager-loading is set.
+   */
+  edges: EntGroupEdges;
+  /** ID of the ent. */
+  id: string;
+  /** Name holds the value of the "name" field. */
+  name: string;
+  /** UpdatedAt holds the value of the "updated_at" field. */
+  updated_at: string;
+}
+
+export interface EntGroupEdges {
+  /** Entities holds the value of the entities edge. */
+  entities: EntEntity[];
+  /** EntityTypes holds the value of the entity_types edge. */
+  entity_types: EntEntityType[];
+  /** InvitationTokens holds the value of the invitation_tokens edge. */
+  invitation_tokens: EntGroupInvitationToken[];
+  /** Labels holds the value of the labels edge. */
+  labels: EntLabel[];
+  /** Notifiers holds the value of the notifiers edge. */
+  notifiers: EntNotifier[];
+  /** Users holds the value of the users edge. */
+  users: EntUser[];
+}
+
+export interface EntGroupInvitationToken {
+  /** CreatedAt holds the value of the "created_at" field. */
+  created_at: string;
+  /**
+   * Edges holds the relations/edges for other nodes in the graph.
+   * The values are being populated by the GroupInvitationTokenQuery when eager-loading is set.
+   */
+  edges: EntGroupInvitationTokenEdges;
+  /** ExpiresAt holds the value of the "expires_at" field. */
+  expires_at: string;
+  /** ID of the ent. */
+  id: string;
+  /** Token holds the value of the "token" field. */
+  token: number[];
+  /** UpdatedAt holds the value of the "updated_at" field. */
+  updated_at: string;
+  /** Uses holds the value of the "uses" field. */
+  uses: number;
+}
+
+export interface EntGroupInvitationTokenEdges {
+  /** Group holds the value of the group edge. */
+  group: EntGroup;
 }
 
 export interface EntLabel {
@@ -322,39 +359,10 @@ export interface EntLabel {
 }
 
 export interface EntLabelEdges {
+  /** Entities holds the value of the entities edge. */
+  entities: EntEntity[];
   /** Group holds the value of the group edge. */
   group: EntGroup;
-  /** Items holds the value of the items edge. */
-  items: EntItem[];
-}
-
-export interface EntLocation {
-  /** CreatedAt holds the value of the "created_at" field. */
-  created_at: string;
-  /** Description holds the value of the "description" field. */
-  description: string;
-  /**
-   * Edges holds the relations/edges for other nodes in the graph.
-   * The values are being populated by the LocationQuery when eager-loading is set.
-   */
-  edges: EntLocationEdges;
-  /** ID of the ent. */
-  id: string;
-  /** Name holds the value of the "name" field. */
-  name: string;
-  /** UpdatedAt holds the value of the "updated_at" field. */
-  updated_at: string;
-}
-
-export interface EntLocationEdges {
-  /** Children holds the value of the children edge. */
-  children: EntLocation[];
-  /** Group holds the value of the group edge. */
-  group: EntGroup;
-  /** Items holds the value of the items edge. */
-  items: EntItem[];
-  /** Parent holds the value of the parent edge. */
-  parent: EntLocation;
 }
 
 export interface EntMaintenanceEntry {
@@ -371,10 +379,10 @@ export interface EntMaintenanceEntry {
    * The values are being populated by the MaintenanceEntryQuery when eager-loading is set.
    */
   edges: EntMaintenanceEntryEdges;
+  /** EntityID holds the value of the "entity_id" field. */
+  entity_id: string;
   /** ID of the ent. */
   id: string;
-  /** ItemID holds the value of the "item_id" field. */
-  item_id: string;
   /** Name holds the value of the "name" field. */
   name: string;
   /** ScheduledDate holds the value of the "scheduled_date" field. */
@@ -384,8 +392,8 @@ export interface EntMaintenanceEntry {
 }
 
 export interface EntMaintenanceEntryEdges {
-  /** Item holds the value of the item edge. */
+  /** Entity holds the value of the entity edge. */
-  item: EntItem;
+  entity: EntEntity;
 }
 
 export interface EntNotifier {
@@ -472,6 +480,52 @@ export interface DuplicateOptions {
   copyPrefix: string;
 }
 
+export interface EntityAttachment {
+  createdAt: Date | string;
+  id: string;
+  mimeType: string;
+  path: string;
+  primary: boolean;
+  thumbnail: EntAttachment;
+  title: string;
+  type: string;
+  updatedAt: Date | string;
+}
+
+export interface EntityAttachmentUpdate {
+  primary: boolean;
+  title: string;
+  type: string;
+}
+
+export interface EntityType {
+  color: string;
+  description: string;
+  icon: string;
+  isLocation: boolean;
+  name: string;
+}
+
+export interface EntityTypeCreate {
+  color: string;
+  description: string;
+  icon: string;
+  isLocation: boolean;
+  name: string;
+}
+
+export interface EntityTypeDelete {
+  replacementId: UuidNullUUID;
+}
+
+export interface EntityTypeUpdate {
+  color: string;
+  description: string;
+  icon: string;
+  /** @minLength 1 */
+  name: string;
+}
+
 export interface Group {
   createdAt: Date | string;
   currency: string;
@@ -494,27 +548,10 @@ export interface GroupUpdate {
   name: string;
 }
 
-export interface ItemAttachment {
-  createdAt: Date | string;
-  id: string;
-  mimeType: string;
-  path: string;
-  primary: boolean;
-  thumbnail: EntAttachment;
-  title: string;
-  type: string;
-  updatedAt: Date | string;
-}
-
-export interface ItemAttachmentUpdate {
-  primary: boolean;
-  title: string;
-  type: string;
-}
-
 export interface ItemCreate {
   /** @maxLength 1000 */
   description: string;
+  entityType: string;
   labelIds: string[];
   /** Edges */
   locationId: string;
@@ -540,9 +577,10 @@ export interface ItemOut {
   archived: boolean;
   /** @example "0" */
   assetId: string;
-  attachments: ItemAttachment[];
+  attachments: EntityAttachment[];
   createdAt: Date | string;
   description: string;
+  entityType: string;
   fields: ItemField[];
   id: string;
   imageId?: string | null;
@@ -595,6 +633,7 @@ export interface ItemSummary {
   assetId: string;
   createdAt: Date | string;
   description: string;
+  entityType: string;
   id: string;
   imageId?: string | null;
   insured: boolean;
@@ -615,6 +654,7 @@ export interface ItemUpdate {
   assetId: string;
   /** @maxLength 1000 */
   description: string;
+  entityType: string;
   fields: ItemField[];
   id: string;
   insured: boolean;
@@ -683,6 +723,7 @@ export interface LabelSummary {
 
 export interface LocationCreate {
   description: string;
+  entityType: string;
   name: string;
   parentId?: string | null;
 }
@@ -691,6 +732,7 @@ export interface LocationOut {
   children: LocationSummary[];
   createdAt: Date | string;
   description: string;
+  entityType: string;
   id: string;
   name: string;
   parent: LocationSummary;
@@ -701,6 +743,7 @@ export interface LocationOut {
 export interface LocationOutCount {
   createdAt: Date | string;
   description: string;
+  entityType: string;
   id: string;
   itemCount: number;
   name: string;
@@ -710,6 +753,7 @@ export interface LocationOutCount {
 export interface LocationSummary {
   createdAt: Date | string;
   description: string;
+  entityType: string;
   id: string;
   name: string;
   updatedAt: Date | string;
@@ -717,6 +761,7 @@ export interface LocationSummary {
 
 export interface LocationUpdate {
   description: string;
+  entityType: string;
   id: string;
   name: string;
   parentId?: string | null;
@@ -854,6 +899,12 @@ export interface UserRegistration {
   token: string;
 }
 
+export interface UuidNullUUID {
+  uuid: string;
+  /** Valid is true if UUID is not NULL */
+  valid: boolean;
+}
+
 export interface APISummary {
   allowRegistration: boolean;
   build: Build;