From 2a9d810d31144cbe34784795f2cff87a7fdb3e34 Mon Sep 17 00:00:00 2001
From: David <darranz@rodax-software.com>
Date: Thu, 8 Oct 2026 16:43:34 +0200
Subject: [PATCH] =?UTF-8?q?Refactorizaci=C3=B3n?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 apps/server/src/applications.integration.ts   |   2 +-
 apps/server/src/brands.integration.ts         |   3 +-
 apps/server/src/certificates.integration.ts   |   2 +-
 .../src/intervention-templates.integration.ts |   2 +-
 apps/server/src/interventions.integration.ts  |   3 +-
 apps/server/src/mail.integration.ts           |  11 +-
 apps/server/src/processes.integration.ts      |   3 +-
 apps/server/src/remote.integration.ts         |   2 +-
 .../src/resource-migration.integration.ts     |   3 +-
 apps/server/src/telework.integration.ts       |   2 +-
 apps/server/src/tickets.integration.ts        |   3 +-
 apps/server/src/work-profiles.integration.ts  |   2 +-
 apps/web/src/app.test.tsx                     |  63 +++
 docs/componentes-de-interfaz.md               |  19 +-
 docs/inventario-de-modales.md                 | 182 ++++++++
 docs/revision-de-buenas-practicas.md          | 149 ++++++
 .../src/api/application/brand-input.mapper.ts |   8 +-
 .../src/api/application/brand.use-cases.ts    |   3 +-
 .../api/application/support-input.mapper.ts   |   3 +-
 .../src/api/application/support.use-cases.ts  |   3 +-
 .../src/api/domain/asset-catalog.aggregate.ts |   3 +-
 .../src/api/domain/asset-definition.entity.ts |   3 +-
 .../domain/asset-relationship.aggregate.ts    |   3 +-
 .../src/api/domain/asset-relationship.test.ts |   6 +-
 .../src/api/domain/asset-revision.entity.ts   |   3 +-
 .../assets/src/api/domain/asset.aggregate.ts  |   3 +-
 .../assets/src/api/domain/brand.aggregate.ts  |   3 +-
 .../support-connection-revision.entity.ts     |   3 +-
 .../domain/support-connection.aggregate.ts    |   3 +-
 .../src/api/domain/support-tool.aggregate.ts  |   6 +-
 .../domain/value-objects/support-values.ts    |   4 +-
 .../value-objects/workstation-values.ts       |   3 +-
 .../api/domain/workstation-revision.entity.ts |   3 +-
 .../src/api/domain/workstation.aggregate.ts   |   3 +-
 .../persistence/asset-dashboard-reader.ts     |   3 +-
 .../persistence/brand-migration.ts            |   3 +-
 .../persistence/sequelize-brand.repository.ts |   3 +-
 .../sequelize-support.repository.ts           |   3 +-
 .../persistence/support-migration.ts          |   3 +-
 .../assets/src/web/asset-detail-dialog.tsx    |  47 ++
 .../assets/src/web/asset-editor-dialog.tsx    |  49 ++
 modules/assets/src/web/asset-form.tsx         |  36 +-
 .../assets/src/web/asset-relationships.tsx    |  71 +--
 modules/assets/src/web/asset-support.tsx      |  57 +--
 modules/assets/src/web/brand-api.ts           |   3 +-
 .../assets/src/web/brand-editor-dialog.tsx    |  30 ++
 modules/assets/src/web/brand-form.tsx         |   3 +-
 modules/assets/src/web/brand-select.tsx       |  26 +-
 modules/assets/src/web/brands-page.tsx        |  20 +-
 .../assets/src/web/catalog-editor-dialog.tsx  |  79 ++++
 .../src/web/catalog-field-create-dialog.tsx   |  31 ++
 modules/assets/src/web/catalog-page.tsx       |  68 +--
 .../web/catalog-relation-create-dialog.tsx    |  31 ++
 .../assets/src/web/catalog-relation-form.tsx  |   3 +-
 .../web/catalog-template-create-dialog.tsx    |  41 ++
 .../assets/src/web/catalog-template-form.tsx  |  28 +-
 .../src/web/end-relationship-dialog.tsx       |  60 +++
 modules/assets/src/web/inventory-api.ts       |   6 +-
 modules/assets/src/web/inventory-page.tsx     |  71 +--
 .../src/web/relationship-editor-dialog.tsx    |  37 ++
 modules/assets/src/web/relationship-form.tsx  |  28 +-
 modules/assets/src/web/support-api.ts         |   3 +-
 .../web/support-connection-editor-dialog.tsx  |  47 ++
 modules/assets/src/web/support-form.tsx       |  33 +-
 .../assets/src/web/support-history-dialog.tsx |  44 ++
 modules/assets/src/web/support-history.tsx    |  31 --
 .../src/web/support-tool-editor-dialog.tsx    |  38 ++
 modules/assets/src/web/support-tool-form.tsx  |   7 +-
 .../assets/src/web/support-tools-dialog.tsx   |  27 ++
 modules/assets/src/web/support-tools.tsx      |  20 +-
 .../web/workstation-asset-create-dialog.tsx   |  44 ++
 .../src/web/workstation-editor-dialog.tsx     |  44 ++
 modules/assets/src/web/workstation-form.tsx   |  37 +-
 .../src/web/workstation-history-dialog.tsx    |  61 +++
 modules/assets/src/web/workstations-page.tsx  |  76 +---
 .../application-configuration-input.mapper.ts |   6 +-
 .../application-configuration.use-cases.ts    |   6 +-
 .../certificate-configuration-input.mapper.ts |   6 +-
 .../certificate-configuration.use-cases.ts    |   6 +-
 .../folder-mapping-input.mapper.ts            |   3 +-
 .../application/folder-mapping.use-cases.ts   |   3 +-
 .../application/intervention-input.mapper.ts  |   3 +-
 .../intervention-template.use-cases.ts        |   6 +-
 .../mail-configuration-input.mapper.ts        |   6 +-
 .../mail-configuration.use-cases.ts           |   6 +-
 .../api/application/mailbox-input.mapper.ts   |   3 +-
 .../src/api/application/mailbox.use-cases.ts  |   3 +-
 .../printer-configuration-input.mapper.ts     |   6 +-
 .../printer-configuration.use-cases.ts        |   6 +-
 .../src/api/application/process.use-cases.ts  |  10 +-
 .../remote-connection-input.mapper.ts         |   6 +-
 .../telework-authorization-input.mapper.ts    |   6 +-
 .../api/application/ticket-input.mapper.ts    |   6 +-
 .../application/work-profile-input.mapper.ts  |   3 +-
 .../access/access-workspace.aggregate.ts      |   3 +-
 ...plication-configuration-revision.entity.ts |   3 +-
 .../application-configuration.aggregate.ts    |   3 +-
 .../domain/application-configuration.test.ts  |   6 +-
 ...rtificate-configuration-revision.entity.ts |   3 +-
 .../certificate-configuration.aggregate.ts    |   3 +-
 .../domain/certificate-configuration.test.ts  |   6 +-
 .../domain/folder-mapping-revision.entity.ts  |   3 +-
 .../api/domain/folder-mapping.aggregate.ts    |   3 +-
 .../domain/intervention-revision.entity.ts    |   3 +-
 .../api/domain/intervention-step.entity.ts    |   7 +-
 .../intervention-template-revision.entity.ts  |   3 +-
 .../intervention-template-step.entity.ts      |   2 +-
 .../domain/intervention-template.aggregate.ts |   3 +-
 .../api/domain/intervention-template.test.ts  |   6 +-
 .../src/api/domain/intervention.aggregate.ts  |   6 +-
 .../src/api/domain/intervention.test.ts       |   3 +-
 .../mail-configuration-revision.entity.ts     |   3 +-
 .../domain/mail-configuration.aggregate.ts    |   3 +-
 .../src/api/domain/mailbox-revision.entity.ts |   3 +-
 .../api/domain/mailbox-use-revision.entity.ts |   3 +-
 .../src/api/domain/mailbox-use.aggregate.ts   |   3 +-
 .../src/api/domain/mailbox.aggregate.ts       |   3 +-
 .../printer-configuration-revision.entity.ts  |   3 +-
 .../domain/printer-configuration.aggregate.ts |   3 +-
 .../api/domain/printer-configuration.test.ts  |   6 +-
 .../src/api/domain/process-revision.entity.ts |   3 +-
 .../src/api/domain/process-task.entity.ts     |   8 +-
 .../process-template-revision.entity.ts       |   3 +-
 .../api/domain/process-template.aggregate.ts  |   3 +-
 .../src/api/domain/process.aggregate.ts       |   6 +-
 .../companies/src/api/domain/process.test.ts  |   8 +-
 .../remote-connection-revision.entity.ts      |   3 +-
 .../api/domain/remote-connection.aggregate.ts |   3 +-
 .../src/api/domain/remote-connection.test.ts  |   6 +-
 .../telework-authorization-revision.entity.ts |   3 +-
 .../telework-authorization.aggregate.ts       |   3 +-
 .../api/domain/telework-authorization.test.ts |   6 +-
 .../src/api/domain/ticket-revision.entity.ts  |   3 +-
 .../src/api/domain/ticket.aggregate.ts        |   3 +-
 .../application-configuration-values.ts       |   2 +-
 .../certificate-configuration-values.ts       |   2 +-
 .../value-objects/folder-mapping-values.ts    |   7 +-
 .../intervention-template-values.ts           |   2 +-
 .../value-objects/intervention-values.ts      |   7 +-
 .../mail-configuration-values.ts              |   7 +-
 .../value-objects/mailbox-use-values.ts       |   3 +-
 .../domain/value-objects/mailbox-values.ts    |   3 +-
 .../printer-configuration-values.ts           |   2 +-
 .../value-objects/process-template-values.ts  |   7 +-
 .../domain/value-objects/process-values.ts    |   3 +-
 .../value-objects/remote-connection-values.ts |   7 +-
 .../telework-authorization-values.ts          |   2 +-
 .../api/domain/value-objects/ticket-values.ts |   8 +-
 .../value-objects/work-profile-values.ts      |   7 +-
 .../domain/work-profile-revision.entity.ts    |   3 +-
 .../src/api/domain/work-profile.aggregate.ts  |   3 +-
 .../http/application-configuration.routes.ts  |   3 +-
 .../http/certificate-configuration.routes.ts  |   3 +-
 .../http/folder-mapping.routes.ts             |   3 +-
 .../http/mail-configuration.routes.ts         |   3 +-
 .../api/infrastructure/http/mailbox.routes.ts |   3 +-
 .../http/printer-configuration.routes.ts      |   3 +-
 .../api/infrastructure/http/process.routes.ts |   3 +-
 .../http/remote-connection.routes.ts          |   3 +-
 .../http/telework-authorization.routes.ts     |   3 +-
 .../http/work-profile.routes.ts               |   3 +-
 .../application-configuration-migration.ts    |   3 +-
 .../certificate-configuration-migration.ts    |   3 +-
 .../persistence/folder-mapping-migration.ts   |   3 +-
 .../persistence/intervention-migration.ts     |   3 +-
 .../intervention-template-migration.ts        |   3 +-
 .../mail-configuration-migration.ts           |   3 +-
 .../persistence/mailbox-migration.ts          |   3 +-
 .../printer-configuration-migration.ts        |   3 +-
 .../persistence/process-migration.ts          |   3 +-
 .../persistence/process-review-reader.ts      |   9 +-
 .../remote-connection-migration.ts            |   3 +-
 ...ze-application-configuration.repository.ts |  19 +-
 ...ze-certificate-configuration.repository.ts |  19 +-
 .../sequelize-dashboard.repository.ts         |   3 +-
 .../sequelize-folder-mapping.repository.ts    |  13 +-
 ...uelize-intervention-template.repository.ts |   3 +-
 .../sequelize-intervention.repository.ts      |   3 +-
 ...sequelize-mail-configuration.repository.ts |  13 +-
 .../sequelize-mailbox.repository.ts           |  12 +-
 ...uelize-printer-configuration.repository.ts |  18 +-
 .../sequelize-process.repository.ts           |  18 +-
 .../sequelize-remote-connection.repository.ts |  13 +-
 ...elize-telework-authorization.repository.ts |   6 +-
 .../sequelize-ticket.repository.ts            |   3 +-
 .../sequelize-work-profile.repository.ts      |   6 +-
 .../telework-authorization-migration.ts       |   3 +-
 .../persistence/ticket-migration.ts           |   3 +-
 .../persistence/work-profile-migration.ts     |   3 +-
 .../src/web/access/access-editor-dialog.tsx   |  56 +++
 .../src/web/access/access-help-dialog.tsx     |  31 ++
 .../src/web/access/access-workspace.tsx       |  43 +-
 .../src/web/applications/application-api.ts   |   2 +-
 ...pplication-configuration-editor-dialog.tsx |  46 ++
 .../application-configuration-form.tsx        |   9 +-
 .../application-configurations-page.tsx       |  46 +-
 .../application-history-dialog.tsx            |  50 ++
 .../web/applications/application-history.tsx  |  35 --
 .../src/web/certificates/certificate-api.ts   |   2 +-
 ...ertificate-configuration-editor-dialog.tsx |  46 ++
 .../certificate-configuration-form.tsx        |   6 +-
 .../certificate-configurations-page.tsx       |  46 +-
 .../certificate-history-dialog.tsx            |  48 ++
 .../web/certificates/certificate-history.tsx  |  33 --
 .../components/assignment-editor-dialog.tsx   |  46 ++
 .../src/web/components/assignment-form.tsx    |  34 +-
 .../components/assignment-history-dialog.tsx  |  47 ++
 .../src/web/components/companies-page.tsx     |  24 +-
 .../web/components/companies-workspace.tsx    | 249 ++--------
 .../src/web/components/company-detail.tsx     |  21 +-
 .../web/components/company-editor-dialog.tsx  |  27 ++
 .../src/web/components/company-inventory.tsx  |  48 +-
 .../components/dashboard-activity-panel.tsx   |  71 +++
 .../src/web/components/dashboard-api.ts       |   2 +-
 .../components/dashboard-attention-panel.tsx  |  78 ++++
 .../components/dashboard-companies-panel.tsx  | 128 ++++++
 .../components/dashboard-details-dialog.tsx   |   8 +-
 .../web/components/dashboard-kind-icons.ts    |  15 +
 .../src/web/components/dashboard-page.tsx     | 428 ++----------------
 .../web/components/dashboard-quick-create.tsx |  22 +-
 .../web/components/dashboard-statistics.tsx   |  84 ++++
 .../web/components/dashboard-work-panel.tsx   |  98 ++++
 .../components/department-editor-dialog.tsx   |  27 ++
 .../src/web/components/department-section.tsx |  22 +-
 .../inventory-quick-create-dialog.tsx         |  58 +++
 .../src/web/components/people-section.tsx     |  23 +-
 .../src/web/components/person-details.tsx     |  58 +--
 .../web/components/person-editor-dialog.tsx   |  28 ++
 .../src/web/components/site-editor-dialog.tsx |  27 ++
 .../src/web/components/site-section.tsx       |  42 +-
 .../src/web/components/workspace-header.tsx   | 119 +++++
 .../components/workspace-settings-dialog.tsx  |  29 ++
 .../src/web/components/workspace-sidebar.tsx  | 141 ++++++
 .../companies/src/web/folders/folder-api.ts   |   2 +-
 .../folders/folder-mapping-editor-dialog.tsx  |  46 ++
 .../src/web/folders/folder-mapping-form.tsx   |   8 +-
 .../folders/folder-mapping-history-dialog.tsx |  50 ++
 .../src/web/folders/folder-mappings-page.tsx  |  67 +--
 .../intervention-template-editor-dialog.tsx   |  54 +++
 .../intervention-templates/template-api.ts    |   2 +-
 .../intervention-templates/template-form.tsx  |   8 +-
 .../intervention-templates/templates-page.tsx |  36 +-
 .../src/web/interventions/intervention-api.ts |   2 +-
 .../intervention-detail-dialog.tsx            |  33 ++
 .../intervention-editor-dialog.tsx            |  45 ++
 .../web/interventions/intervention-fields.tsx |   7 +-
 .../web/interventions/intervention-form.tsx   |  96 ++--
 .../web/interventions/intervention-steps.tsx  |   6 +-
 .../intervention-template-create-dialog.tsx   |  35 ++
 .../intervention-ticket-create-dialog.tsx     |  51 +++
 .../web/interventions/interventions-page.tsx  |  51 +--
 modules/companies/src/web/mail/mail-api.ts    |   2 +-
 .../mail/mail-configuration-editor-dialog.tsx |  46 ++
 .../src/web/mail/mail-configuration-form.tsx  |   6 +-
 .../mail-configuration-history-dialog.tsx     |  52 +++
 .../web/mail/mail-configuration-targets.tsx   |   6 +-
 .../src/web/mail/mail-configurations-page.tsx |  69 +--
 modules/companies/src/web/mail/mailbox-api.ts |   7 +-
 .../src/web/mail/mailbox-create-dialog.tsx    |  37 ++
 .../src/web/mail/mailbox-relations.tsx        |  25 +-
 .../web/mail/mailbox-use-editor-dialog.tsx    |  44 ++
 .../src/web/mail/mailbox-use-form.tsx         |  69 ++-
 .../companies/src/web/printers/printer-api.ts |   2 +-
 .../printer-configuration-editor-dialog.tsx   |  46 ++
 .../printers/printer-configuration-form.tsx   |  41 +-
 .../printers/printer-configurations-page.tsx  |  48 +-
 .../web/printers/printer-history-dialog.tsx   |  48 ++
 .../src/web/printers/printer-history.tsx      |  29 --
 .../printer-profile-create-dialog.tsx         |  37 ++
 .../src/web/processes/process-api.ts          |   8 +-
 .../src/web/processes/process-detail.tsx      |  18 +-
 .../src/web/processes/process-edit-dialog.tsx |  34 ++
 .../src/web/processes/process-edit-form.tsx   |   7 +-
 .../processes/process-quick-create-dialog.tsx |  39 ++
 .../web/processes/process-start-dialog.tsx    |  36 ++
 .../src/web/processes/process-start-form.tsx  |  27 +-
 .../src/web/processes/process-task-field.tsx  |   7 +-
 .../process-template-editor-dialog.tsx        |  50 ++
 .../web/processes/process-template-form.tsx   |   7 +-
 .../web/processes/process-templates-page.tsx  |  32 +-
 .../src/web/processes/processes-page.tsx      |  28 +-
 .../src/web/profiles/environment-content.tsx  |   7 +-
 .../web/profiles/work-environment.test.tsx    |   3 +-
 .../src/web/profiles/work-profile-api.ts      |   7 +-
 .../profiles/work-profile-editor-dialog.tsx   |  43 ++
 .../src/web/profiles/work-profile-form.tsx    |  13 +-
 .../profiles/work-profile-history-dialog.tsx  |  84 ++++
 .../src/web/profiles/work-profiles-page.tsx   |  95 +---
 .../companies/src/web/remote/remote-api.ts    |   2 +-
 .../remote-connection-editor-dialog.tsx       |  46 ++
 .../src/web/remote/remote-connection-form.tsx |   6 +-
 .../remote-connection-history-dialog.tsx      |  63 +++
 .../web/remote/remote-connections-page.tsx    |  74 +--
 .../src/web/remote/remote-endpoint-fields.tsx |   6 +-
 .../src/web/telework/telework-api.ts          |   2 +-
 .../telework-authorization-editor-dialog.tsx  |  48 ++
 .../telework/telework-authorization-form.tsx  |  40 +-
 .../telework-authorization-history-dialog.tsx |  54 +++
 .../telework/telework-authorizations-page.tsx |  72 +--
 .../companies/src/web/tickets/ticket-api.ts   |   8 +-
 .../tickets/ticket-classification-fields.tsx  |   8 +-
 .../src/web/tickets/ticket-detail-dialog.tsx  |  33 ++
 .../src/web/tickets/ticket-editor-dialog.tsx  |  45 ++
 .../companies/src/web/tickets/ticket-form.tsx |  12 +-
 .../tickets/ticket-intervention-dialog.tsx    |  40 ++
 .../tickets/ticket-target-create-dialog.tsx   |  41 ++
 .../src/web/tickets/ticket-targets.tsx        |  41 +-
 .../src/web/tickets/tickets-page.tsx          |  76 +---
 .../components/account-password-dialog.tsx    |  31 ++
 .../src/web/components/custom-workspace.tsx   |  30 +-
 .../src/web/components/password-form.tsx      |   9 +-
 .../src/web/components/user-editor-dialog.tsx |  54 +++
 .../identity/src/web/components/user-form.tsx |   9 +-
 .../web/components/user-management-dialog.tsx |  28 ++
 .../src/web/components/user-management.tsx    |  54 +--
 .../api/domain/resource-catalog.aggregate.ts  |   3 +-
 .../api/domain/resource-definition.entity.ts  |   3 +-
 .../api/domain/resource-revision.entity.ts    |   3 +-
 .../src/api/domain/resource.aggregate.ts      |   3 +-
 .../persistence/resource-dashboard-reader.ts  |   3 +-
 .../src/web/catalog-editor-dialog.tsx         |  68 +++
 .../src/web/catalog-field-create-dialog.tsx   |  31 ++
 modules/resources/src/web/catalog-page.tsx    |  57 +--
 .../web/catalog-template-create-dialog.tsx    |  41 ++
 .../src/web/catalog-template-form.tsx         |  28 +-
 .../src/web/resource-detail-dialog.tsx        |  38 ++
 .../src/web/resource-editor-dialog.tsx        |  46 ++
 modules/resources/src/web/resource-form.tsx   |  34 +-
 modules/resources/src/web/resources-page.tsx  |  57 +--
 329 files changed, 5194 insertions(+), 2842 deletions(-)
 create mode 100644 docs/inventario-de-modales.md
 create mode 100644 docs/revision-de-buenas-practicas.md
 create mode 100644 modules/assets/src/web/asset-detail-dialog.tsx
 create mode 100644 modules/assets/src/web/asset-editor-dialog.tsx
 create mode 100644 modules/assets/src/web/brand-editor-dialog.tsx
 create mode 100644 modules/assets/src/web/catalog-editor-dialog.tsx
 create mode 100644 modules/assets/src/web/catalog-field-create-dialog.tsx
 create mode 100644 modules/assets/src/web/catalog-relation-create-dialog.tsx
 create mode 100644 modules/assets/src/web/catalog-template-create-dialog.tsx
 create mode 100644 modules/assets/src/web/end-relationship-dialog.tsx
 create mode 100644 modules/assets/src/web/relationship-editor-dialog.tsx
 create mode 100644 modules/assets/src/web/support-connection-editor-dialog.tsx
 create mode 100644 modules/assets/src/web/support-history-dialog.tsx
 delete mode 100644 modules/assets/src/web/support-history.tsx
 create mode 100644 modules/assets/src/web/support-tool-editor-dialog.tsx
 create mode 100644 modules/assets/src/web/support-tools-dialog.tsx
 create mode 100644 modules/assets/src/web/workstation-asset-create-dialog.tsx
 create mode 100644 modules/assets/src/web/workstation-editor-dialog.tsx
 create mode 100644 modules/assets/src/web/workstation-history-dialog.tsx
 create mode 100644 modules/companies/src/web/access/access-editor-dialog.tsx
 create mode 100644 modules/companies/src/web/access/access-help-dialog.tsx
 create mode 100644 modules/companies/src/web/applications/application-configuration-editor-dialog.tsx
 create mode 100644 modules/companies/src/web/applications/application-history-dialog.tsx
 delete mode 100644 modules/companies/src/web/applications/application-history.tsx
 create mode 100644 modules/companies/src/web/certificates/certificate-configuration-editor-dialog.tsx
 create mode 100644 modules/companies/src/web/certificates/certificate-history-dialog.tsx
 delete mode 100644 modules/companies/src/web/certificates/certificate-history.tsx
 create mode 100644 modules/companies/src/web/components/assignment-editor-dialog.tsx
 create mode 100644 modules/companies/src/web/components/assignment-history-dialog.tsx
 create mode 100644 modules/companies/src/web/components/company-editor-dialog.tsx
 create mode 100644 modules/companies/src/web/components/dashboard-activity-panel.tsx
 create mode 100644 modules/companies/src/web/components/dashboard-attention-panel.tsx
 create mode 100644 modules/companies/src/web/components/dashboard-companies-panel.tsx
 create mode 100644 modules/companies/src/web/components/dashboard-kind-icons.ts
 create mode 100644 modules/companies/src/web/components/dashboard-statistics.tsx
 create mode 100644 modules/companies/src/web/components/dashboard-work-panel.tsx
 create mode 100644 modules/companies/src/web/components/department-editor-dialog.tsx
 create mode 100644 modules/companies/src/web/components/inventory-quick-create-dialog.tsx
 create mode 100644 modules/companies/src/web/components/person-editor-dialog.tsx
 create mode 100644 modules/companies/src/web/components/site-editor-dialog.tsx
 create mode 100644 modules/companies/src/web/components/workspace-header.tsx
 create mode 100644 modules/companies/src/web/components/workspace-settings-dialog.tsx
 create mode 100644 modules/companies/src/web/components/workspace-sidebar.tsx
 create mode 100644 modules/companies/src/web/folders/folder-mapping-editor-dialog.tsx
 create mode 100644 modules/companies/src/web/folders/folder-mapping-history-dialog.tsx
 create mode 100644 modules/companies/src/web/intervention-templates/intervention-template-editor-dialog.tsx
 create mode 100644 modules/companies/src/web/interventions/intervention-detail-dialog.tsx
 create mode 100644 modules/companies/src/web/interventions/intervention-editor-dialog.tsx
 create mode 100644 modules/companies/src/web/interventions/intervention-template-create-dialog.tsx
 create mode 100644 modules/companies/src/web/interventions/intervention-ticket-create-dialog.tsx
 create mode 100644 modules/companies/src/web/mail/mail-configuration-editor-dialog.tsx
 create mode 100644 modules/companies/src/web/mail/mail-configuration-history-dialog.tsx
 create mode 100644 modules/companies/src/web/mail/mailbox-create-dialog.tsx
 create mode 100644 modules/companies/src/web/mail/mailbox-use-editor-dialog.tsx
 create mode 100644 modules/companies/src/web/printers/printer-configuration-editor-dialog.tsx
 create mode 100644 modules/companies/src/web/printers/printer-history-dialog.tsx
 delete mode 100644 modules/companies/src/web/printers/printer-history.tsx
 create mode 100644 modules/companies/src/web/printers/printer-profile-create-dialog.tsx
 create mode 100644 modules/companies/src/web/processes/process-edit-dialog.tsx
 create mode 100644 modules/companies/src/web/processes/process-quick-create-dialog.tsx
 create mode 100644 modules/companies/src/web/processes/process-start-dialog.tsx
 create mode 100644 modules/companies/src/web/processes/process-template-editor-dialog.tsx
 create mode 100644 modules/companies/src/web/profiles/work-profile-editor-dialog.tsx
 create mode 100644 modules/companies/src/web/profiles/work-profile-history-dialog.tsx
 create mode 100644 modules/companies/src/web/remote/remote-connection-editor-dialog.tsx
 create mode 100644 modules/companies/src/web/remote/remote-connection-history-dialog.tsx
 create mode 100644 modules/companies/src/web/telework/telework-authorization-editor-dialog.tsx
 create mode 100644 modules/companies/src/web/telework/telework-authorization-history-dialog.tsx
 create mode 100644 modules/companies/src/web/tickets/ticket-detail-dialog.tsx
 create mode 100644 modules/companies/src/web/tickets/ticket-editor-dialog.tsx
 create mode 100644 modules/companies/src/web/tickets/ticket-intervention-dialog.tsx
 create mode 100644 modules/companies/src/web/tickets/ticket-target-create-dialog.tsx
 create mode 100644 modules/identity/src/web/components/account-password-dialog.tsx
 create mode 100644 modules/identity/src/web/components/user-editor-dialog.tsx
 create mode 100644 modules/identity/src/web/components/user-management-dialog.tsx
 create mode 100644 modules/resources/src/web/catalog-editor-dialog.tsx
 create mode 100644 modules/resources/src/web/catalog-field-create-dialog.tsx
 create mode 100644 modules/resources/src/web/catalog-template-create-dialog.tsx
 create mode 100644 modules/resources/src/web/resource-detail-dialog.tsx
 create mode 100644 modules/resources/src/web/resource-editor-dialog.tsx

diff --git a/apps/server/src/applications.integration.ts b/apps/server/src/applications.integration.ts
index 08b3b20..5914d26 100644
--- a/apps/server/src/applications.integration.ts
+++ b/apps/server/src/applications.integration.ts
@@ -2,8 +2,8 @@ import assert from "node:assert/strict";
 import { randomUUID } from "node:crypto";
 
 import { InventoryResponseSchema as AssetsSchema } from "@metis/assets/common";
+import type { ApplicationConfigurationInput } from "@metis/companies/common";
 import {
-  type ApplicationConfigurationInput,
   ApplicationConfigurationResponseSchema,
   ApplicationConfigurationsResponseSchema,
   CompanyResponseSchema,
diff --git a/apps/server/src/brands.integration.ts b/apps/server/src/brands.integration.ts
index 21bd347..c83153d 100644
--- a/apps/server/src/brands.integration.ts
+++ b/apps/server/src/brands.integration.ts
@@ -7,7 +7,8 @@ import {
   BrandsResponseSchema,
   CatalogResponseSchema,
 } from "@metis/assets/common";
-import { QueryTypes, type Sequelize } from "sequelize";
+import type { Sequelize } from "sequelize";
+import { QueryTypes } from "sequelize";
 import { z } from "zod/v4";
 
 import {
diff --git a/apps/server/src/certificates.integration.ts b/apps/server/src/certificates.integration.ts
index b11683c..2b8b621 100644
--- a/apps/server/src/certificates.integration.ts
+++ b/apps/server/src/certificates.integration.ts
@@ -2,8 +2,8 @@ import assert from "node:assert/strict";
 import { randomUUID } from "node:crypto";
 
 import { InventoryResponseSchema as AssetsSchema } from "@metis/assets/common";
+import type { CertificateConfigurationInput } from "@metis/companies/common";
 import {
-  type CertificateConfigurationInput,
   CertificateConfigurationResponseSchema,
   CertificateConfigurationsResponseSchema,
   CompanyResponseSchema,
diff --git a/apps/server/src/intervention-templates.integration.ts b/apps/server/src/intervention-templates.integration.ts
index 455a23e..eaabda8 100644
--- a/apps/server/src/intervention-templates.integration.ts
+++ b/apps/server/src/intervention-templates.integration.ts
@@ -1,8 +1,8 @@
 import assert from "node:assert/strict";
 import { randomUUID } from "node:crypto";
 
+import type { InterventionTemplateDTO } from "@metis/companies/common";
 import {
-  type InterventionTemplateDTO,
   InterventionTemplateResponseSchema,
   InterventionTemplatesSchema,
 } from "@metis/companies/common";
diff --git a/apps/server/src/interventions.integration.ts b/apps/server/src/interventions.integration.ts
index b4f4af4..f98de06 100644
--- a/apps/server/src/interventions.integration.ts
+++ b/apps/server/src/interventions.integration.ts
@@ -1,9 +1,8 @@
 import assert from "node:assert/strict";
 import { randomUUID } from "node:crypto";
 
+import type { InterventionDTO, InterventionInput } from "@metis/companies/common";
 import {
-  type InterventionDTO,
-  type InterventionInput,
   InterventionListSchema,
   InterventionLookupsSchema,
   InterventionResponseSchema,
diff --git a/apps/server/src/mail.integration.ts b/apps/server/src/mail.integration.ts
index 5eaaffb..6b3eea0 100644
--- a/apps/server/src/mail.integration.ts
+++ b/apps/server/src/mail.integration.ts
@@ -2,18 +2,21 @@ import assert from "node:assert/strict";
 import { randomUUID } from "node:crypto";
 
 import { InventoryResponseSchema } from "@metis/assets/common";
+import type {
+  MailConfigurationInput,
+  MailboxInput,
+  MailboxUseInput,
+} from "@metis/companies/common";
 import {
   AccessResponseSchema,
   CompanyResponseSchema,
-  type MailConfigurationInput,
   MailConfigurationResponseSchema,
   MailConfigurationsResponseSchema,
-  type MailboxInput,
-  type MailboxUseInput,
   MailboxesResponseSchema,
   WorkProfileResponseSchema,
 } from "@metis/companies/common";
-import { QueryTypes, type Sequelize } from "sequelize";
+import type { Sequelize } from "sequelize";
+import { QueryTypes } from "sequelize";
 import { z } from "zod/v4";
 
 type Request = (path: string, body?: unknown, origin?: string, token?: string) => Promise<Response>;
diff --git a/apps/server/src/processes.integration.ts b/apps/server/src/processes.integration.ts
index 2a6b6b5..4cb772e 100644
--- a/apps/server/src/processes.integration.ts
+++ b/apps/server/src/processes.integration.ts
@@ -2,17 +2,16 @@ import assert from "node:assert/strict";
 import { randomUUID } from "node:crypto";
 
 import { InventoryResponseSchema as AssetsSchema } from "@metis/assets/common";
+import type { ProcessTemplateInput, UpdateProcessInput } from "@metis/companies/common";
 import {
   ApplicationConfigurationResponseSchema,
   CompanyResponseSchema,
   ProcessResponseSchema,
   ProcessReviewResponseSchema,
-  type ProcessTemplateInput,
   ProcessTemplateResponseSchema,
   ProcessTemplatesResponseSchema,
   ProcessesResponseSchema,
   RemoteConnectionResponseSchema,
-  type UpdateProcessInput,
   WorkProfileResponseSchema,
 } from "@metis/companies/common";
 import { InventoryResponseSchema as ResourcesSchema } from "@metis/resources/common";
diff --git a/apps/server/src/remote.integration.ts b/apps/server/src/remote.integration.ts
index 4d1fe0d..9a724b7 100644
--- a/apps/server/src/remote.integration.ts
+++ b/apps/server/src/remote.integration.ts
@@ -2,9 +2,9 @@ import assert from "node:assert/strict";
 import { randomUUID } from "node:crypto";
 
 import { InventoryResponseSchema as AssetsSchema } from "@metis/assets/common";
+import type { RemoteConnectionInput } from "@metis/companies/common";
 import {
   CompanyResponseSchema,
-  type RemoteConnectionInput,
   RemoteConnectionResponseSchema,
   RemoteConnectionsResponseSchema,
   TeleworkAuthorizationResponseSchema,
diff --git a/apps/server/src/resource-migration.integration.ts b/apps/server/src/resource-migration.integration.ts
index 032ef6f..30d9dc5 100644
--- a/apps/server/src/resource-migration.integration.ts
+++ b/apps/server/src/resource-migration.integration.ts
@@ -4,7 +4,8 @@ import { AccessResponseSchema, MailboxesResponseSchema } from "@metis/companies/
 import type { ResourceDTO } from "@metis/resources/common";
 import { InventoryResponseSchema, ResourceResponseSchema } from "@metis/resources/common";
 import { createResourceModule } from "@metis/resources/module";
-import { QueryTypes, type Sequelize } from "sequelize";
+import type { Sequelize } from "sequelize";
+import { QueryTypes } from "sequelize";
 import { z } from "zod/v4";
 
 type Request = (path: string, body?: unknown) => Promise<Response>;
diff --git a/apps/server/src/telework.integration.ts b/apps/server/src/telework.integration.ts
index 4d3299d..4161d59 100644
--- a/apps/server/src/telework.integration.ts
+++ b/apps/server/src/telework.integration.ts
@@ -1,9 +1,9 @@
 import assert from "node:assert/strict";
 import { randomUUID } from "node:crypto";
 
+import type { TeleworkAuthorizationInput } from "@metis/companies/common";
 import {
   CompanyResponseSchema,
-  type TeleworkAuthorizationInput,
   TeleworkAuthorizationResponseSchema,
   TeleworkAuthorizationsResponseSchema,
 } from "@metis/companies/common";
diff --git a/apps/server/src/tickets.integration.ts b/apps/server/src/tickets.integration.ts
index 0f5304e..5939db0 100644
--- a/apps/server/src/tickets.integration.ts
+++ b/apps/server/src/tickets.integration.ts
@@ -2,10 +2,9 @@ import assert from "node:assert/strict";
 import { randomUUID } from "node:crypto";
 
 import { InventoryResponseSchema } from "@metis/assets/common";
+import type { TicketDTO, TicketInput } from "@metis/companies/common";
 import {
   CompanyResponseSchema,
-  type TicketDTO,
-  type TicketInput,
   TicketListSchema,
   TicketLookupsSchema,
   TicketResponseSchema,
diff --git a/apps/server/src/work-profiles.integration.ts b/apps/server/src/work-profiles.integration.ts
index 7b6c958..415de18 100644
--- a/apps/server/src/work-profiles.integration.ts
+++ b/apps/server/src/work-profiles.integration.ts
@@ -1,8 +1,8 @@
 import assert from "node:assert/strict";
 
 import { InventoryResponseSchema } from "@metis/assets/common";
+import type { AccessFieldsDTO } from "@metis/companies/common";
 import {
-  type AccessFieldsDTO,
   AccessResponseSchema,
   CompanyResponseSchema,
   WorkProfileResponseSchema,
diff --git a/apps/web/src/app.test.tsx b/apps/web/src/app.test.tsx
index a82a936..140d56a 100644
--- a/apps/web/src/app.test.tsx
+++ b/apps/web/src/app.test.tsx
@@ -203,3 +203,66 @@ test("los enlaces del dashboard mantienen la compañía y la ficha exacta", () =
     entityId: "entry",
   });
 });
+
+test("los bloques del dashboard presentan datos, avisos y actividad reales en ambos idiomas", async () => {
+  const session = { user, csrfToken: "a".repeat(64), setupRequired: false };
+  for (const language of ["es", "en"]) {
+    const html = await renderPage(language, session, (client) => {
+      client.setQueryData(companyKeys.list, { companies: [workspaceCompany] });
+      client.setQueryData(dashboardKeys.block("summary"), {
+        companies: 1,
+        tickets: 2,
+        interventions: 3,
+        assets: 4,
+        resources: 5,
+      });
+      const entry = {
+        id: workspaceCompany.id,
+        companyId: workspaceCompany.id,
+        companyName: workspaceCompany.name,
+        name: "Revisar acceso",
+        kind: "ticket",
+        reference: "T-2026-001",
+        state: "open",
+        priority: "high",
+        recordedAt: "2026-10-01T10:30:00.000Z",
+        actorName: "Operador test",
+      };
+      client.setQueryData(dashboardKeys.block("work"), { items: [entry], total: 1 });
+      client.setQueryData(dashboardKeys.block("activity"), { items: [entry], total: 1 });
+      client.setQueryData(dashboardKeys.block("attention"), {
+        items: [{ kind: "missing_site", count: 2 }],
+      });
+      client.setQueryData(dashboardKeys.block("companies"), {
+        items: [
+          {
+            id: workspaceCompany.id,
+            name: workspaceCompany.name,
+            companies: 1,
+            tickets: 2,
+            interventions: 3,
+            assets: 4,
+            resources: 5,
+            people: 6,
+          },
+        ],
+        total: 1,
+      });
+    });
+    assert.ok(html.includes("Revisar acceso"));
+    assert.ok(html.includes("T-2026-001"));
+    assert.ok(html.includes("Operador test"));
+    assert.ok(html.includes(workspaceCompany.name));
+    assert.ok(html.includes('dateTime="2026-10-01T10:30:00.000Z"'));
+    assert.ok(html.includes('data-state="high"'));
+    assert.ok(html.includes('data-state="open"'));
+    assert.ok(
+      html.includes(
+        `aria-label="${language === "es" ? "Tickets abiertos" : "Open tickets"} · ${workspaceCompany.name}: 2"`
+      )
+    );
+    assert.equal(html.includes("dashboard.issues.missing_site"), false);
+    assert.equal(html.includes('role="alert"'), false);
+    assert.equal(html.includes("<form"), false);
+  }
+});
diff --git a/docs/componentes-de-interfaz.md b/docs/componentes-de-interfaz.md
index 65359ca..dcb9f87 100644
--- a/docs/componentes-de-interfaz.md
+++ b/docs/componentes-de-interfaz.md
@@ -105,11 +105,28 @@ Se declara @tanstack/react-table en el paquete compartido porque es quien consum
 
 ## Catálogo de marcas y selector funcional
 
-BrandCatalogPage reutiliza EntityListHeader/EntityTable con búsqueda, filtro de estado, columnas, ordenación y paginación. BrandForm reutiliza FormDialog, ContextHelp y FormActions tanto para la gestión global como para las altas relacionadas.
+BrandCatalogPage reutiliza EntityListHeader/EntityTable con búsqueda, filtro de estado, columnas, ordenación y paginación. BrandEditorDialog compone FormDialog y BrandForm tanto para la gestión global como para las altas relacionadas; el formulario conserva ContextHelp y FormActions.
 
 BrandSelect, dentro del módulo assets, adapta SelectWithAction al catálogo remoto: filtra marcas activas, conserva la selección inactiva actual y textos anteriores, ofrece alta rápida y respeta una sola anidación. El borrador padre se conserva y la nueva marca se selecciona por UUID. El componente genérico no conoce BrandDTO, consultas ni endpoints. Véase [Catálogo global de marcas](catalogo-global-de-marcas.md).
 
 
+## Componentes modales de los módulos
+
+El [inventario de modales](inventario-de-modales.md) localiza las interacciones de alta, edición,
+copia, confirmación, detalle, historial, selección, ayuda y configuración, incluyendo las altas
+rápidas dentro de otros formularios. La regla normativa de organización reside en AGENTS.md.
+
+Las páginas coordinan apertura, selección y callbacks. El componente modal posee su estructura
+y la lógica que le pertenece; el formulario mantiene validación, borrador, errores y guardado.
+Se reutilizan FormDialog y FormActions sin modificar su implementación vendor. Los diálogos
+específicos de entidades viven junto a sus consumidores, no en la biblioteca visual genérica.
+
+CompanyEditorDialog, PersonEditorDialog, DepartmentEditorDialog, SiteEditorDialog,
+BrandEditorDialog y SupportToolEditorDialog se reutilizan donde ya existen operaciones
+equivalentes. Los callbacks de guardado actualizan la selección del consumidor; no se cierra
+un formulario por el mero inicio de una mutación. Los historiales de consulta se derivan de
+los datos remotos actuales, mientras que los borradores de edición permanecen locales.
+
 ## Acciones de fila ancladas
 
 EntityRowActions muestra un botón icon-sm con EllipsisIcon, etiqueta accesible y título traducidos, sin texto visible repetido. EntityTable reserva la identidad de columna actions para operaciones: siempre visible, sin búsqueda/ordenación y fijada a la derecha mediante columnPinning de TanStack Table. EntityTableContent renderiza primero las columnas de datos y después la columna anclada, con cabecera/celdas sticky right-0, alineación derecha, anchura compacta y fondo opaco para evitar solapamientos al desplazar la tabla. Todos los listados consumidores heredan este comportamiento.
diff --git a/docs/inventario-de-modales.md b/docs/inventario-de-modales.md
new file mode 100644
index 0000000..f573163
--- /dev/null
+++ b/docs/inventario-de-modales.md
@@ -0,0 +1,182 @@
+# Inventario de interacciones modales
+
+Revisión de 2026-10-08. Se inspeccionaron las primitivas y wrappers importados, sus consumidores,
+los bloques condicionales y las implementaciones manuales posibles: Dialog, AlertDialog, Sheet,
+Drawer, FormDialog, portales, elementos dialog, aria-modal y roles dialog/alertdialog.
+La búsqueda no dependió del nombre de los componentes.
+
+El código propio contiene **81 componentes que construyen una interacción modal**. Todos
+usan FormDialog de @repo/shadcn-ui y tienen un componente principal por fichero. Un componente
+puede representar variantes de alta, edición o copia, y catálogos con distintos tipos; el número
+no es un recuento de todos los estados posibles de las ventanas. No se encontraron otras
+implementaciones propias con AlertDialog, Sheet, Drawer ni diálogos HTML/manuales.
+
+La implementación vendor de packages/shadcn-ui queda fuera de la refactorización según AGENTS.md.
+Sus primitivas y el diálogo de configuración de tablas se consultan y consumen, no se duplican
+ni reorganizan. Los popovers de selectores y menús de acciones no se contabilizan como formularios
+o ventanas modales funcionales.
+
+## Responsabilidades y consumidores
+
+Las páginas y listados conservan apertura, selección y callbacks. Los componentes enumerados
+encapsulan título, disposición, anchura, contenido y cierre. Los formularios existentes mantienen
+sus schemas, borradores, mutaciones, ayuda y errores. EndRelationshipDialog posee además la
+mutación de confirmación y sus estados pendientes y de error.
+
+CompanyEditorDialog, PersonEditorDialog, DepartmentEditorDialog y SiteEditorDialog se reutilizan
+desde listados y altas rápidas equivalentes. BrandEditorDialog y SupportToolEditorDialog comparten
+el patrón entre catálogo y selector. Los callbacks de selección permanecen en el consumidor que
+posee el borrador. Las altas anidadas conservan sus restricciones existentes.
+
+Se integró el contenido exclusivo de los antiguos SupportHistory, ApplicationHistory,
+CertificateHistory y PrinterHistory en sus respectivos componentes de diálogo, tras comprobar
+sus referencias. No se eliminaron historiales ni acciones. Los archivos anteriores se pueden
+recuperar desde Git.
+
+## Componentes por área
+
+### modules/assets/src/web
+
+- [AssetDetailDialog](../modules/assets/src/web/asset-detail-dialog.tsx)
+- [AssetEditorDialog](../modules/assets/src/web/asset-editor-dialog.tsx)
+- [BrandEditorDialog](../modules/assets/src/web/brand-editor-dialog.tsx)
+- [CatalogDefinitionDialog](../modules/assets/src/web/catalog-definition-dialog.tsx)
+- [CatalogEditorDialog](../modules/assets/src/web/catalog-editor-dialog.tsx)
+- [CatalogFieldCreateDialog](../modules/assets/src/web/catalog-field-create-dialog.tsx)
+- [CatalogRelationCreateDialog](../modules/assets/src/web/catalog-relation-create-dialog.tsx)
+- [CatalogTemplateCreateDialog](../modules/assets/src/web/catalog-template-create-dialog.tsx)
+- [EndRelationshipDialog](../modules/assets/src/web/end-relationship-dialog.tsx)
+- [RelationshipEditorDialog](../modules/assets/src/web/relationship-editor-dialog.tsx)
+- [SupportConnectionEditorDialog](../modules/assets/src/web/support-connection-editor-dialog.tsx)
+- [SupportHistoryDialog](../modules/assets/src/web/support-history-dialog.tsx)
+- [SupportToolEditorDialog](../modules/assets/src/web/support-tool-editor-dialog.tsx)
+- [SupportToolsDialog](../modules/assets/src/web/support-tools-dialog.tsx)
+- [WorkstationAssetCreateDialog](../modules/assets/src/web/workstation-asset-create-dialog.tsx)
+- [WorkstationEditorDialog](../modules/assets/src/web/workstation-editor-dialog.tsx)
+- [WorkstationHistoryDialog](../modules/assets/src/web/workstation-history-dialog.tsx)
+
+### modules/companies/src/web/access
+
+- [AccessEditorDialog](../modules/companies/src/web/access/access-editor-dialog.tsx)
+- [AccessHelpDialog](../modules/companies/src/web/access/access-help-dialog.tsx)
+- [AccessHistory](../modules/companies/src/web/access/access-history.tsx)
+- [AccessQuickEditor](../modules/companies/src/web/access/access-quick-editor.tsx)
+- [QuickCreateDialog](../modules/companies/src/web/access/quick-create-dialog.tsx)
+
+### modules/companies/src/web/applications
+
+- [ApplicationConfigurationEditorDialog](../modules/companies/src/web/applications/application-configuration-editor-dialog.tsx)
+- [ApplicationHistoryDialog](../modules/companies/src/web/applications/application-history-dialog.tsx)
+- [ApplicationQuickEditor](../modules/companies/src/web/applications/application-quick-editor.tsx)
+
+### modules/companies/src/web/certificates
+
+- [CertificateConfigurationEditorDialog](../modules/companies/src/web/certificates/certificate-configuration-editor-dialog.tsx)
+- [CertificateHistoryDialog](../modules/companies/src/web/certificates/certificate-history-dialog.tsx)
+- [CertificateQuickEditor](../modules/companies/src/web/certificates/certificate-quick-editor.tsx)
+
+### modules/companies/src/web/components
+
+- [AssignmentEditorDialog](../modules/companies/src/web/components/assignment-editor-dialog.tsx)
+- [AssignmentHistoryDialog](../modules/companies/src/web/components/assignment-history-dialog.tsx)
+- [CompanyEditorDialog](../modules/companies/src/web/components/company-editor-dialog.tsx)
+- [ConfigurationQuickEditor](../modules/companies/src/web/components/configuration-quick-editor.tsx)
+- [DashboardDetailsDialog](../modules/companies/src/web/components/dashboard-details-dialog.tsx)
+- [DashboardQuickCreate](../modules/companies/src/web/components/dashboard-quick-create.tsx)
+- [DepartmentEditorDialog](../modules/companies/src/web/components/department-editor-dialog.tsx)
+- [InventoryQuickCreateDialog](../modules/companies/src/web/components/inventory-quick-create-dialog.tsx)
+- [PersonEditorDialog](../modules/companies/src/web/components/person-editor-dialog.tsx)
+- [SiteEditorDialog](../modules/companies/src/web/components/site-editor-dialog.tsx)
+- [WorkspaceSettingsDialog](../modules/companies/src/web/components/workspace-settings-dialog.tsx)
+
+### modules/companies/src/web/folders
+
+- [FolderMappingEditorDialog](../modules/companies/src/web/folders/folder-mapping-editor-dialog.tsx)
+- [FolderMappingHistoryDialog](../modules/companies/src/web/folders/folder-mapping-history-dialog.tsx)
+- [FolderQuickEditor](../modules/companies/src/web/folders/folder-quick-editor.tsx)
+
+### modules/companies/src/web/intervention-templates
+
+- [InterventionTemplateEditorDialog](../modules/companies/src/web/intervention-templates/intervention-template-editor-dialog.tsx)
+
+### modules/companies/src/web/interventions
+
+- [InterventionDetailDialog](../modules/companies/src/web/interventions/intervention-detail-dialog.tsx)
+- [InterventionEditorDialog](../modules/companies/src/web/interventions/intervention-editor-dialog.tsx)
+- [InterventionTemplateCreateDialog](../modules/companies/src/web/interventions/intervention-template-create-dialog.tsx)
+- [InterventionTicketCreateDialog](../modules/companies/src/web/interventions/intervention-ticket-create-dialog.tsx)
+
+### modules/companies/src/web/mail
+
+- [MailboxCreateDialog](../modules/companies/src/web/mail/mailbox-create-dialog.tsx)
+- [MailboxUseEditorDialog](../modules/companies/src/web/mail/mailbox-use-editor-dialog.tsx)
+- [MailConfigurationEditorDialog](../modules/companies/src/web/mail/mail-configuration-editor-dialog.tsx)
+- [MailConfigurationHistoryDialog](../modules/companies/src/web/mail/mail-configuration-history-dialog.tsx)
+- [MailQuickEditor](../modules/companies/src/web/mail/mail-quick-editor.tsx)
+
+### modules/companies/src/web/printers
+
+- [PrinterConfigurationEditorDialog](../modules/companies/src/web/printers/printer-configuration-editor-dialog.tsx)
+- [PrinterHistoryDialog](../modules/companies/src/web/printers/printer-history-dialog.tsx)
+- [PrinterProfileCreateDialog](../modules/companies/src/web/printers/printer-profile-create-dialog.tsx)
+
+### modules/companies/src/web/processes
+
+- [ProcessEditDialog](../modules/companies/src/web/processes/process-edit-dialog.tsx)
+- [ProcessQuickCreateDialog](../modules/companies/src/web/processes/process-quick-create-dialog.tsx)
+- [ProcessStartDialog](../modules/companies/src/web/processes/process-start-dialog.tsx)
+- [ProcessTemplateEditorDialog](../modules/companies/src/web/processes/process-template-editor-dialog.tsx)
+
+### modules/companies/src/web/profiles
+
+- [WorkProfileEditorDialog](../modules/companies/src/web/profiles/work-profile-editor-dialog.tsx)
+- [WorkProfileHistoryDialog](../modules/companies/src/web/profiles/work-profile-history-dialog.tsx)
+
+### modules/companies/src/web/remote
+
+- [RemoteConnectionEditorDialog](../modules/companies/src/web/remote/remote-connection-editor-dialog.tsx)
+- [RemoteConnectionHistoryDialog](../modules/companies/src/web/remote/remote-connection-history-dialog.tsx)
+- [RemoteQuickEditor](../modules/companies/src/web/remote/remote-quick-editor.tsx)
+
+### modules/companies/src/web/telework
+
+- [TeleworkAuthorizationEditorDialog](../modules/companies/src/web/telework/telework-authorization-editor-dialog.tsx)
+- [TeleworkAuthorizationHistoryDialog](../modules/companies/src/web/telework/telework-authorization-history-dialog.tsx)
+
+### modules/companies/src/web/tickets
+
+- [TicketDetailDialog](../modules/companies/src/web/tickets/ticket-detail-dialog.tsx)
+- [TicketEditorDialog](../modules/companies/src/web/tickets/ticket-editor-dialog.tsx)
+- [TicketInterventionDialog](../modules/companies/src/web/tickets/ticket-intervention-dialog.tsx)
+- [TicketQuickEditor](../modules/companies/src/web/tickets/ticket-quick-editor.tsx)
+- [TicketQuickForms](../modules/companies/src/web/tickets/ticket-quick-forms.tsx)
+- [TicketTargetCreateDialog](../modules/companies/src/web/tickets/ticket-target-create-dialog.tsx)
+
+### modules/identity/src/web/components
+
+- [AccountPasswordDialog](../modules/identity/src/web/components/account-password-dialog.tsx)
+- [UserEditorDialog](../modules/identity/src/web/components/user-editor-dialog.tsx)
+- [UserManagementDialog](../modules/identity/src/web/components/user-management-dialog.tsx)
+
+### modules/resources/src/web
+
+- [CatalogDefinitionDialog](../modules/resources/src/web/catalog-definition-dialog.tsx)
+- [CatalogEditorDialog](../modules/resources/src/web/catalog-editor-dialog.tsx)
+- [CatalogFieldCreateDialog](../modules/resources/src/web/catalog-field-create-dialog.tsx)
+- [CatalogTemplateCreateDialog](../modules/resources/src/web/catalog-template-create-dialog.tsx)
+- [ResourceDetailDialog](../modules/resources/src/web/resource-detail-dialog.tsx)
+- [ResourceEditorDialog](../modules/resources/src/web/resource-editor-dialog.tsx)
+
+## Comprobaciones y límites
+
+Typecheck, lint, pruebas de los módulos y validaciones globales correctos. Las pruebas existentes
+comprueban traducciones es/en, listados sin formularios visibles, ayuda, restricciones de altas
+anidadas, estados y contratos. Se amplió la prueba del dashboard con datos no vacíos de los
+paneles extraídos.
+
+No se ejecutó una sesión interactiva de navegador. Queda por comprobar manualmente apertura,
+Escape, restauración del foco, cancelación, envío y error en modales simples y anidados, en español,
+inglés y anchura móvil. El render estático y el lint no sustituyen esa comprobación.
+
+Véase [revisión de buenas prácticas](revision-de-buenas-practicas.md) para el alcance y los resultados
+globales, y [componentes de interfaz](componentes-de-interfaz.md) para los patrones compartidos.
diff --git a/docs/revision-de-buenas-practicas.md b/docs/revision-de-buenas-practicas.md
new file mode 100644
index 0000000..1994bac
--- /dev/null
+++ b/docs/revision-de-buenas-practicas.md
@@ -0,0 +1,149 @@
+# Revisión de buenas prácticas
+
+Revisión realizada el 2026-10-08 conforme a AGENTS.md y a los documentos de arquitectura
+de capas, composición, flujo HTTP, contratos, pruebas y modelo DDD e identificadores.
+Se consultaron también el patrón de listados y los componentes de interfaz.
+
+## Alcance y método
+
+Se inventariaron estructura, dependencias, configuración y patrones antes de modificar código.
+La revisión combinó inspección estructural de todos los archivos TypeScript propios con lectura
+por áreas, fronteras y patrones repetidos, comprobaciones de referencias y pruebas dirigidas.
+No equivale a una certificación de seguridad ni a una comprobación manual de cada interacción.
+
+El inventario final contiene 756 archivos TypeScript/TSX propios, incluidas pruebas:
+
+| Área | Archivos | Responsabilidades inspeccionadas |
+| --- | ---: | --- |
+| apps/server | 31 | Arranque, configuración, cierre, HTTP, logging e integraciones |
+| apps/web | 8 | Composición React, idioma, proveedores, dashboard integrado y pruebas |
+| modules/core | 11 | Contratos de salud, rutas, acceso HTTP y pantalla técnica |
+| modules/identity | 38 | Usuarios, sesiones, autenticación, contraseñas y formularios |
+| modules/companies | 460 | Compañías, personas, departamentos, sedes, accesos, perfiles, correo, carpetas, aplicaciones, certificados, impresoras, teletrabajo, remotos, procesos, tickets, intervenciones, plantillas y dashboard |
+| modules/assets | 136 | Catálogos, marcas, inventario, relaciones, puestos y asistencia |
+| modules/resources | 63 | Catálogos, inventario, características e integraciones |
+| packages/rdx-ddd y rdx-utils | 9 | Identidad, entidades, agregados, Value Objects, Result y Maybe |
+
+Se inspeccionaron además scripts, configuración TypeScript/Biome/PNPM, composition roots y
+exports para entender sus contratos. No se alteraron dependencias, APIs públicas, schemas HTTP,
+lógica de migraciones ni persistencia como parte de esta refactorización. Los errores de entrada HTTP
+malformada sí se corrigieron en el middleware común.
+
+La implementación de packages/shadcn-ui está excluida de cambios por AGENTS.md. Sus APIs se
+consultaron para consumir los patrones existentes. Se preservó el cambio local del usuario en
+packages/shadcn-ui/src/styles/globals.css. No se imprimieron ni versionaron archivos .env.
+
+## Orden de trabajo
+
+1. Inspección global y lectura normativa, con clasificación de patrones y riesgos.
+2. Componentes propios compartidos, composición de identidad y formularios de accesos.
+3. Catálogos e inventarios de activos y recursos; asistencia y relaciones.
+4. Compañías, perfiles, configuraciones, procesos, tickets e intervenciones.
+5. Fronteras HTTP, contraseñas, datos persistidos, logging y ciclo de vida del servidor.
+6. Inventario completo y separación de modales, incluidos wrappers y altas anidadas.
+7. Paneles del dashboard, navegación lateral y búsqueda global.
+8. Convenciones de imports de tipos, revisión del diff y validaciones globales.
+
+Los primeros cambios ya quedaron incorporados en el commit 7f336df durante la revisión.
+La extracción de modales, las últimas convenciones y la documentación se entregan en el
+working tree posterior a 6bb9845; no se ha creado otro commit automáticamente.
+
+## Incumplimientos corregidos
+
+- Varios componentes significativos en un mismo TSX: se separaron responsabilidades reales,
+  sin convertir fragmentos triviales de JSX en componentes artificiales.
+- Formularios, historiales y confirmaciones implementados dentro de listados: ahora viven
+  en componentes modales propios. El [inventario](inventario-de-modales.md) enumera los 81
+  componentes que construyen una interacción modal y sus ficheros, incluidas variantes
+  ya independientes antes de esta revisión.
+- Estructuras modales repetidas para una misma entidad: se reutilizan diálogos de compañía,
+  persona, departamento, sede, marca y herramienta de asistencia entre sus consumidores.
+- Copias locales de datos de consulta usados solo para visualizar: se conservan identificadores
+  y se deriva el dato actual desde TanStack Query. Los borradores de edición deliberados siguen
+  siendo locales. No se agregaron efectos ni memoización preventiva.
+- Dashboard y shell con responsabilidades mezcladas: paneles independientes para trabajo,
+  avisos, actividad, compañías e indicadores; búsqueda local en WorkspaceHeader y navegación
+  en WorkspaceSidebar. Se mantienen query keys, cancelación de consultas y navegación.
+- Imports de valores y tipos mezclados: se separaron 237 declaraciones mixtas en import type
+  y los imports de runtime correspondientes. Una comparación de tokens y bindings verificó
+  que 193 ficheros de esta última fase solo cambian imports, no lógica ni imports de runtime.
+- Cast de JSON persistido: se usa unknown antes de la validación del dashboard.
+- Promesa de envío en AccessForm: se utiliza la mutación con gestión explícita del resultado
+  y del error, sin descartar una promesa rechazada de mutateAsync.
+- Código sin consumidores y variables no utilizadas: retirada tras comprobar referencias.
+- Logging SQL habilitado: desactivado para no emitir parámetros sensibles de sesiones o usuarios.
+- Cuerpos HTTP inválidos tratados como errores internos: clasificación de errores del parser
+  con respuestas seguras 400/413/415; errores inesperados conservan respuesta genérica 500.
+- Hash scrypt con segmentos sobrantes aceptado: rechazo explícito y prueba de regresión.
+- Cierre del servidor repetible y errores de cierre: protección contra señales duplicadas,
+  observación del cierre y conservación del error original cuando falla la limpieza.
+
+Se conservaron los encadenamientos con catch(next) en Express 4: convertirlos a handlers async
+sin propagación explícita habría introducido una regresión. Los schemas de dominio existentes
+y sus Value Objects no se sustituyeron por DTOs de transporte ni casts. El ORM permanece en
+Infrastructure; las referencias transversales de pruebas no son dependencias del dominio.
+
+El análisis final del código propio no encontró any, non-null assertions, casts distintos de
+as const, import("...").Tipo, imports mixtos pendientes ni ficheros de producción con varios
+componentes principales. Esto describe las comprobaciones estructurales ejecutadas, no una
+garantía de ausencia de cualquier defecto posible.
+
+## Archivos especialmente modificados
+
+- modules/companies/src/web/components/companies-workspace.tsx, dashboard-page.tsx y sus
+  componentes de navegación, búsqueda y paneles.
+- modules/companies/src/web/access/access-form.tsx, access-form-fields.tsx,
+  access-quick-editor.tsx y access-workspace.tsx.
+- Listados y formularios de companies, assets y resources: diálogos editor/detail/history/create
+  próximos a cada funcionalidad, enumerados en el inventario de modales.
+- modules/identity/src/web/components: composición del espacio, gestión de usuarios y
+  formularios de contraseña con FormActions.
+- apps/server/src/app.ts, index.ts y config/database.ts.
+- modules/identity/src/api/infrastructure/security/scrypt-password-hasher.ts.
+- modules/companies/src/api/infrastructure/persistence/sequelize-dashboard.repository.ts.
+- apps/server/src/app.test.ts, scrypt-password-hasher.test.ts y apps/web/src/app.test.tsx.
+
+Se integró el contenido exclusivo de los antiguos support-history.tsx, application-history.tsx,
+certificate-history.tsx y printer-history.tsx en sus respectivos componentes *-history-dialog.tsx.
+No se eliminó la funcionalidad; las versiones anteriores son recuperables desde Git.
+
+## Validaciones ejecutadas
+
+Entorno comprobado: WSL/bash, Node.js v24.20.0 y PNPM 11.25.0, conforme a package.json.
+
+| Comando | Resultado |
+| --- | --- |
+| pnpm --filter @metis/companies typecheck y test | Correctos |
+| pnpm --filter @metis/assets typecheck y test | Correctos |
+| pnpm --filter @metis/resources typecheck y test | Correctos |
+| pnpm --filter @metis/identity typecheck y test | Correctos |
+| pnpm --filter @metis/web test | Correcto; se amplió la cobertura del dashboard con datos reales en es/en |
+| pnpm --filter @metis/server test | Correcto; HTTP real e integración MariaDB en la base exclusiva de pruebas |
+| pnpm typecheck | Correcto: 10 tareas; última ejecución con 9 resultados de caché y web recompilado |
+| pnpm lint | Correcto, sin diagnósticos |
+| pnpm test | Correcto: 9 tareas sin caché; incluye HTTP real e integración MariaDB |
+| pnpm check | Correcto, sin diagnósticos |
+| pnpm build | Correcto: servidor y web; primera ejecución compiló, repetición usó caché |
+| git diff --check | Correcto |
+
+Se aplicaron comprobaciones Biome dirigidas tras cada grupo de cambios. El sandbox no permite
+abrir sockets para las pruebas HTTP; esas pruebas se ejecutaron con permiso ampliado, utilizando
+la base metis_desk_test que el propio runner configura y verifica. No se modificó una base de
+producción. Los errores intermedios de tipos introducidos durante las extracciones se corrigieron
+antes de las validaciones finales.
+
+## Pendientes y revisión humana
+
+1. **Prueba interactiva de modales y navegación.** Área: componentes enumerados en el inventario.
+   Las pruebas de render estático y lint no verifican foco, Escape, portales ni interacción real.
+   No se ejecutó navegador ni E2E interactivo. Propuesta: comprobar alta/edición/cancelación,
+   envío pendiente, error y selección anidada en es/en y anchura móvil. No requiere cambiar
+   contratos ni introducir una librería de pruebas automáticamente.
+2. **Tamaño del bundle web.** Área: apps/web/vite.config.ts y composición de los módulos web.
+   Vite advierte de un chunk JS de aproximadamente 1,20 MB minificado (330 kB gzip), por encima
+   de 500 kB. La compilación termina correctamente. No se añadió code splitting sin medir la
+   carga y decidir fronteras de carga diferida y fallbacks. Propuesta: evaluar el perfil de carga
+   y acordar después qué espacios cargar de manera diferida; no silenciar el aviso aumentando
+   el límite.
+
+No se detectó un bloqueo que requiriera cambiar contratos, modelo de datos o arquitectura.
diff --git a/modules/assets/src/api/application/brand-input.mapper.ts b/modules/assets/src/api/application/brand-input.mapper.ts
index 7c3eb41..e1474fb 100644
--- a/modules/assets/src/api/application/brand-input.mapper.ts
+++ b/modules/assets/src/api/application/brand-input.mapper.ts
@@ -1,12 +1,8 @@
 import { Name } from "@repo/rdx-ddd";
 import { Result } from "@repo/rdx-utils";
 
-import {
-  BrandError,
-  type BrandInput,
-  BrandInputSchema,
-  type BrandProps,
-} from "../domain/brand.aggregate";
+import type { BrandInput, BrandProps } from "../domain/brand.aggregate";
+import { BrandError, BrandInputSchema } from "../domain/brand.aggregate";
 export function mapBrandInput(input: BrandInput, builtin = false): Result<BrandProps, BrandError> {
   const parsed = BrandInputSchema.safeParse(input);
   if (!parsed.success) {
diff --git a/modules/assets/src/api/application/brand.use-cases.ts b/modules/assets/src/api/application/brand.use-cases.ts
index aabe208..9512b20 100644
--- a/modules/assets/src/api/application/brand.use-cases.ts
+++ b/modules/assets/src/api/application/brand.use-cases.ts
@@ -1,7 +1,8 @@
 import { UniqueID } from "@repo/rdx-ddd";
 import { Result } from "@repo/rdx-utils";
 
-import { Brand, BrandError, type BrandInput } from "../domain/brand.aggregate";
+import type { BrandInput } from "../domain/brand.aggregate";
+import { Brand, BrandError } from "../domain/brand.aggregate";
 
 import type { IBrandRepository } from "./brand.repository";
 import { mapBrandInput } from "./brand-input.mapper";
diff --git a/modules/assets/src/api/application/support-input.mapper.ts b/modules/assets/src/api/application/support-input.mapper.ts
index a71cf2f..106b430 100644
--- a/modules/assets/src/api/application/support-input.mapper.ts
+++ b/modules/assets/src/api/application/support-input.mapper.ts
@@ -1,7 +1,8 @@
 import { Result } from "@repo/rdx-utils";
 
 import type { SupportConnection } from "../domain/support-connection.aggregate";
-import { SupportError, type SupportInput } from "../domain/support-values";
+import type { SupportInput } from "../domain/support-values";
+import { SupportError } from "../domain/support-values";
 import { SupportValues } from "../domain/value-objects/support-values";
 
 import type { SupportContext } from "./support.repository";
diff --git a/modules/assets/src/api/application/support.use-cases.ts b/modules/assets/src/api/application/support.use-cases.ts
index e8e2611..e5c7431 100644
--- a/modules/assets/src/api/application/support.use-cases.ts
+++ b/modules/assets/src/api/application/support.use-cases.ts
@@ -3,7 +3,8 @@ import { Result } from "@repo/rdx-utils";
 
 import { SupportConnection } from "../domain/support-connection.aggregate";
 import { SupportTool } from "../domain/support-tool.aggregate";
-import { SupportError, type SupportInput, type SupportToolInput } from "../domain/support-values";
+import type { SupportInput, SupportToolInput } from "../domain/support-values";
+import { SupportError } from "../domain/support-values";
 
 import type { ISupportRepository } from "./support.repository";
 import { mapSupportInput } from "./support-input.mapper";
diff --git a/modules/assets/src/api/domain/asset-catalog.aggregate.ts b/modules/assets/src/api/domain/asset-catalog.aggregate.ts
index 4e5bfbe..6563200 100644
--- a/modules/assets/src/api/domain/asset-catalog.aggregate.ts
+++ b/modules/assets/src/api/domain/asset-catalog.aggregate.ts
@@ -1,4 +1,5 @@
-import { AggregateRoot, type UniqueID } from "@repo/rdx-ddd";
+import type { UniqueID } from "@repo/rdx-ddd";
+import { AggregateRoot } from "@repo/rdx-ddd";
 import { Maybe, Result } from "@repo/rdx-utils";
 
 import { AssetCatalogError } from "./asset-definition";
diff --git a/modules/assets/src/api/domain/asset-definition.entity.ts b/modules/assets/src/api/domain/asset-definition.entity.ts
index 167fbf2..742d5dc 100644
--- a/modules/assets/src/api/domain/asset-definition.entity.ts
+++ b/modules/assets/src/api/domain/asset-definition.entity.ts
@@ -1,4 +1,5 @@
-import { DomainEntity, type UniqueID } from "@repo/rdx-ddd";
+import type { UniqueID } from "@repo/rdx-ddd";
+import { DomainEntity } from "@repo/rdx-ddd";
 import { Maybe, Result } from "@repo/rdx-utils";
 
 import { AssetCatalogError } from "./asset-definition";
diff --git a/modules/assets/src/api/domain/asset-relationship.aggregate.ts b/modules/assets/src/api/domain/asset-relationship.aggregate.ts
index f0a7be2..d2b3f90 100644
--- a/modules/assets/src/api/domain/asset-relationship.aggregate.ts
+++ b/modules/assets/src/api/domain/asset-relationship.aggregate.ts
@@ -1,4 +1,5 @@
-import { AggregateRoot, type UniqueID } from "@repo/rdx-ddd";
+import type { UniqueID } from "@repo/rdx-ddd";
+import { AggregateRoot } from "@repo/rdx-ddd";
 import { Maybe, Result } from "@repo/rdx-utils";
 import { z } from "zod/v4";
 
diff --git a/modules/assets/src/api/domain/asset-relationship.test.ts b/modules/assets/src/api/domain/asset-relationship.test.ts
index 73d022d..3f5f927 100644
--- a/modules/assets/src/api/domain/asset-relationship.test.ts
+++ b/modules/assets/src/api/domain/asset-relationship.test.ts
@@ -8,10 +8,8 @@ import { AssetCatalog } from "./asset-catalog.aggregate";
 import { seedAssetCatalog } from "./asset-catalog-seed";
 import { AssetRelationship } from "./asset-relationship.aggregate";
 import { AssetDefinitionValues } from "./value-objects/asset-definition-values";
-import {
-  AssetRelationshipValues,
-  type RelationshipValuesData,
-} from "./value-objects/asset-relationship-values";
+import type { RelationshipValuesData } from "./value-objects/asset-relationship-values";
+import { AssetRelationshipValues } from "./value-objects/asset-relationship-values";
 
 const sourceId = UniqueID.generateNewID().toPrimitive();
 const targetId = UniqueID.generateNewID().toPrimitive();
diff --git a/modules/assets/src/api/domain/asset-revision.entity.ts b/modules/assets/src/api/domain/asset-revision.entity.ts
index 10514ce..055545e 100644
--- a/modules/assets/src/api/domain/asset-revision.entity.ts
+++ b/modules/assets/src/api/domain/asset-revision.entity.ts
@@ -1,4 +1,5 @@
-import { DomainEntity, type UniqueID } from "@repo/rdx-ddd";
+import type { UniqueID } from "@repo/rdx-ddd";
+import { DomainEntity } from "@repo/rdx-ddd";
 
 import type { AssetValues } from "./value-objects/asset-values";
 export type AssetRevisionProps = Readonly<{
diff --git a/modules/assets/src/api/domain/asset.aggregate.ts b/modules/assets/src/api/domain/asset.aggregate.ts
index d0112c2..fc0e199 100644
--- a/modules/assets/src/api/domain/asset.aggregate.ts
+++ b/modules/assets/src/api/domain/asset.aggregate.ts
@@ -1,4 +1,5 @@
-import { AggregateRoot, type UniqueID } from "@repo/rdx-ddd";
+import type { UniqueID } from "@repo/rdx-ddd";
+import { AggregateRoot } from "@repo/rdx-ddd";
 import { Result } from "@repo/rdx-utils";
 
 import { AssetCatalogError } from "./asset-definition";
diff --git a/modules/assets/src/api/domain/brand.aggregate.ts b/modules/assets/src/api/domain/brand.aggregate.ts
index 85a2f0d..546bf01 100644
--- a/modules/assets/src/api/domain/brand.aggregate.ts
+++ b/modules/assets/src/api/domain/brand.aggregate.ts
@@ -1,4 +1,5 @@
-import { AggregateRoot, type Name, type UniqueID } from "@repo/rdx-ddd";
+import type { Name, UniqueID } from "@repo/rdx-ddd";
+import { AggregateRoot } from "@repo/rdx-ddd";
 import { Result } from "@repo/rdx-utils";
 import { z } from "zod/v4";
 
diff --git a/modules/assets/src/api/domain/support-connection-revision.entity.ts b/modules/assets/src/api/domain/support-connection-revision.entity.ts
index c5a3bcd..2a86f4f 100644
--- a/modules/assets/src/api/domain/support-connection-revision.entity.ts
+++ b/modules/assets/src/api/domain/support-connection-revision.entity.ts
@@ -1,4 +1,5 @@
-import { DomainEntity, type UniqueID } from "@repo/rdx-ddd";
+import type { UniqueID } from "@repo/rdx-ddd";
+import { DomainEntity } from "@repo/rdx-ddd";
 
 import type { SupportValues } from "./value-objects/support-values";
 export type SupportConnectionRevisionProps = Readonly<{
diff --git a/modules/assets/src/api/domain/support-connection.aggregate.ts b/modules/assets/src/api/domain/support-connection.aggregate.ts
index 990b996..58ccd02 100644
--- a/modules/assets/src/api/domain/support-connection.aggregate.ts
+++ b/modules/assets/src/api/domain/support-connection.aggregate.ts
@@ -1,4 +1,5 @@
-import { AggregateRoot, type UniqueID } from "@repo/rdx-ddd";
+import type { UniqueID } from "@repo/rdx-ddd";
+import { AggregateRoot } from "@repo/rdx-ddd";
 import { Result } from "@repo/rdx-utils";
 import { z } from "zod/v4";
 
diff --git a/modules/assets/src/api/domain/support-tool.aggregate.ts b/modules/assets/src/api/domain/support-tool.aggregate.ts
index fa79165..22528b3 100644
--- a/modules/assets/src/api/domain/support-tool.aggregate.ts
+++ b/modules/assets/src/api/domain/support-tool.aggregate.ts
@@ -1,7 +1,9 @@
-import { AggregateRoot, Name, type UniqueID } from "@repo/rdx-ddd";
+import type { UniqueID } from "@repo/rdx-ddd";
+import { AggregateRoot, Name } from "@repo/rdx-ddd";
 import { Result } from "@repo/rdx-utils";
 
-import { SupportError, type SupportToolInput, SupportToolInputSchema } from "./support-values";
+import type { SupportToolInput } from "./support-values";
+import { SupportError, SupportToolInputSchema } from "./support-values";
 
 type Props = Readonly<{ name: Name; active: boolean; builtin: boolean }>;
 export class SupportTool extends AggregateRoot<Props> {
diff --git a/modules/assets/src/api/domain/value-objects/support-values.ts b/modules/assets/src/api/domain/value-objects/support-values.ts
index aa501f0..9fc64d2 100644
--- a/modules/assets/src/api/domain/value-objects/support-values.ts
+++ b/modules/assets/src/api/domain/value-objects/support-values.ts
@@ -1,7 +1,9 @@
 import { UniqueID } from "@repo/rdx-ddd";
 import { Result } from "@repo/rdx-utils";
 
-import { SupportError, type SupportInput, SupportValuesSchema } from "../support-values";
+import type { SupportInput } from "../support-values";
+import { SupportError, SupportValuesSchema } from "../support-values";
+
 export class SupportValues {
   private constructor(
     public readonly toolId: UniqueID,
diff --git a/modules/assets/src/api/domain/value-objects/workstation-values.ts b/modules/assets/src/api/domain/value-objects/workstation-values.ts
index 6481aa8..37788bb 100644
--- a/modules/assets/src/api/domain/value-objects/workstation-values.ts
+++ b/modules/assets/src/api/domain/value-objects/workstation-values.ts
@@ -2,7 +2,8 @@ import { Name, UniqueID } from "@repo/rdx-ddd";
 import { Maybe, Result } from "@repo/rdx-utils";
 
 import { AssetCatalogError } from "../asset-definition";
-import { type WorkstationInput, WorkstationInputSchema } from "../workstation-values";
+import type { WorkstationInput } from "../workstation-values";
+import { WorkstationInputSchema } from "../workstation-values";
 export class WorkstationValues {
   private constructor(
     public readonly name: Name,
diff --git a/modules/assets/src/api/domain/workstation-revision.entity.ts b/modules/assets/src/api/domain/workstation-revision.entity.ts
index 00adc25..c9bbe32 100644
--- a/modules/assets/src/api/domain/workstation-revision.entity.ts
+++ b/modules/assets/src/api/domain/workstation-revision.entity.ts
@@ -1,4 +1,5 @@
-import { DomainEntity, type UniqueID } from "@repo/rdx-ddd";
+import type { UniqueID } from "@repo/rdx-ddd";
+import { DomainEntity } from "@repo/rdx-ddd";
 
 import type { WorkstationValues } from "./value-objects/workstation-values";
 export type WorkstationRevisionProps = Readonly<{
diff --git a/modules/assets/src/api/domain/workstation.aggregate.ts b/modules/assets/src/api/domain/workstation.aggregate.ts
index 181880b..0f7c57c 100644
--- a/modules/assets/src/api/domain/workstation.aggregate.ts
+++ b/modules/assets/src/api/domain/workstation.aggregate.ts
@@ -1,4 +1,5 @@
-import { AggregateRoot, type UniqueID } from "@repo/rdx-ddd";
+import type { UniqueID } from "@repo/rdx-ddd";
+import { AggregateRoot } from "@repo/rdx-ddd";
 import { Result } from "@repo/rdx-utils";
 import { z } from "zod/v4";
 
diff --git a/modules/assets/src/api/infrastructure/persistence/asset-dashboard-reader.ts b/modules/assets/src/api/infrastructure/persistence/asset-dashboard-reader.ts
index c9b944f..f0e7aac 100644
--- a/modules/assets/src/api/infrastructure/persistence/asset-dashboard-reader.ts
+++ b/modules/assets/src/api/infrastructure/persistence/asset-dashboard-reader.ts
@@ -1,4 +1,5 @@
-import { QueryTypes, type Sequelize } from "sequelize";
+import type { Sequelize } from "sequelize";
+import { QueryTypes } from "sequelize";
 
 type Entry = {
   eventId?: string;
diff --git a/modules/assets/src/api/infrastructure/persistence/brand-migration.ts b/modules/assets/src/api/infrastructure/persistence/brand-migration.ts
index 0986ea9..1609bb3 100644
--- a/modules/assets/src/api/infrastructure/persistence/brand-migration.ts
+++ b/modules/assets/src/api/infrastructure/persistence/brand-migration.ts
@@ -1,5 +1,6 @@
 import { UniqueID } from "@repo/rdx-ddd";
-import { DataTypes, QueryTypes, type Sequelize } from "sequelize";
+import type { Sequelize } from "sequelize";
+import { DataTypes, QueryTypes } from "sequelize";
 import { z } from "zod/v4";
 
 import { mapBrandInput } from "../../application/brand-input.mapper";
diff --git a/modules/assets/src/api/infrastructure/persistence/sequelize-brand.repository.ts b/modules/assets/src/api/infrastructure/persistence/sequelize-brand.repository.ts
index 7a4fa41..2063ee7 100644
--- a/modules/assets/src/api/infrastructure/persistence/sequelize-brand.repository.ts
+++ b/modules/assets/src/api/infrastructure/persistence/sequelize-brand.repository.ts
@@ -1,5 +1,6 @@
 import { Result } from "@repo/rdx-utils";
-import { QueryTypes, type Sequelize, type Transaction } from "sequelize";
+import type { Sequelize, Transaction } from "sequelize";
+import { QueryTypes } from "sequelize";
 
 import type { IBrandRepository } from "../../application/brand.repository";
 
diff --git a/modules/assets/src/api/infrastructure/persistence/sequelize-support.repository.ts b/modules/assets/src/api/infrastructure/persistence/sequelize-support.repository.ts
index fbab795..4ecafad 100644
--- a/modules/assets/src/api/infrastructure/persistence/sequelize-support.repository.ts
+++ b/modules/assets/src/api/infrastructure/persistence/sequelize-support.repository.ts
@@ -1,6 +1,7 @@
 import type { UniqueID } from "@repo/rdx-ddd";
 import { Result } from "@repo/rdx-utils";
-import { QueryTypes, type Sequelize, type Transaction } from "sequelize";
+import type { Sequelize, Transaction } from "sequelize";
+import { QueryTypes } from "sequelize";
 
 import type { ISupportRepository, SupportContext } from "../../application/support.repository";
 import { AssetInputSchema } from "../../domain/asset-values";
diff --git a/modules/assets/src/api/infrastructure/persistence/support-migration.ts b/modules/assets/src/api/infrastructure/persistence/support-migration.ts
index 798e84d..3028d66 100644
--- a/modules/assets/src/api/infrastructure/persistence/support-migration.ts
+++ b/modules/assets/src/api/infrastructure/persistence/support-migration.ts
@@ -1,5 +1,6 @@
 import { UniqueID } from "@repo/rdx-ddd";
-import { DataTypes, QueryTypes, type Sequelize } from "sequelize";
+import type { Sequelize } from "sequelize";
+import { DataTypes, QueryTypes } from "sequelize";
 export async function migrateSupport(database: Sequelize) {
   const query = database.getQueryInterface();
   const tables = await database.query<{ name: string }>(
diff --git a/modules/assets/src/web/asset-detail-dialog.tsx b/modules/assets/src/web/asset-detail-dialog.tsx
new file mode 100644
index 0000000..358ffa9
--- /dev/null
+++ b/modules/assets/src/web/asset-detail-dialog.tsx
@@ -0,0 +1,47 @@
+import { FormDialog } from "@repo/shadcn-ui/components/form-dialog";
+import type { ComponentProps } from "react";
+import { useTranslation } from "react-i18next";
+
+import { AssetDetail } from "./asset-detail";
+import { AssetRelationships } from "./asset-relationships";
+import { AssetSupport } from "./asset-support";
+
+export function AssetDetailDialog({
+  asset,
+  lookups,
+  companyId,
+  csrfToken,
+  onClose,
+}: {
+  asset: ComponentProps<typeof AssetDetail>["asset"];
+  lookups: ComponentProps<typeof AssetDetail>["lookups"];
+  companyId: string;
+  csrfToken: string;
+  onClose: () => void;
+}) {
+  const { t } = useTranslation("assets");
+
+  return (
+    <FormDialog
+      cancelLabel={t("close")}
+      onOpenChange={(open) => {
+        if (!open) {
+          onClose();
+        }
+      }}
+      open
+      title={asset.values.name}
+      wide
+    >
+      <AssetDetail asset={asset} lookups={lookups}>
+        <AssetRelationships assetId={asset.id} companyId={companyId} csrfToken={csrfToken} />
+        <AssetSupport
+          assetId={asset.id}
+          companyId={companyId}
+          csrfToken={csrfToken}
+          retired={asset.values.status === "retired"}
+        />
+      </AssetDetail>
+    </FormDialog>
+  );
+}
diff --git a/modules/assets/src/web/asset-editor-dialog.tsx b/modules/assets/src/web/asset-editor-dialog.tsx
new file mode 100644
index 0000000..4383040
--- /dev/null
+++ b/modules/assets/src/web/asset-editor-dialog.tsx
@@ -0,0 +1,49 @@
+import { FormDialog } from "@repo/shadcn-ui/components/form-dialog";
+import type { ComponentProps } from "react";
+import { useTranslation } from "react-i18next";
+
+import { AssetForm } from "./asset-form";
+
+export function AssetEditorDialog({
+  asset,
+  companyId,
+  csrfToken,
+  items,
+  lookups,
+  onSaved,
+  onClose,
+}: {
+  asset: ComponentProps<typeof AssetForm>["asset"];
+  companyId: string;
+  csrfToken: string;
+  items: ComponentProps<typeof AssetForm>["items"];
+  lookups: ComponentProps<typeof AssetForm>["lookups"];
+  onSaved: (id: string) => void;
+  onClose: () => void;
+}) {
+  const { t } = useTranslation("assets");
+
+  return (
+    <FormDialog
+      cancelLabel={t("cancel")}
+      formActions
+      onOpenChange={(open) => {
+        if (!open) {
+          onClose();
+        }
+      }}
+      open
+      title={t(asset ? "editAsset" : "newAsset")}
+      wide
+    >
+      <AssetForm
+        asset={asset}
+        companyId={companyId}
+        csrfToken={csrfToken}
+        items={items}
+        lookups={lookups}
+        onSaved={onSaved}
+      />
+    </FormDialog>
+  );
+}
diff --git a/modules/assets/src/web/asset-form.tsx b/modules/assets/src/web/asset-form.tsx
index fdcc004..f238d47 100644
--- a/modules/assets/src/web/asset-form.tsx
+++ b/modules/assets/src/web/asset-form.tsx
@@ -1,7 +1,7 @@
 import { zodResolver } from "@hookform/resolvers/zod";
 import { Button } from "@repo/shadcn-ui/components/button";
 import { ContextHelp } from "@repo/shadcn-ui/components/context-help";
-import { FormActions, FormDialog } from "@repo/shadcn-ui/components/form-dialog";
+import { FormActions } from "@repo/shadcn-ui/components/form-dialog";
 import { Input } from "@repo/shadcn-ui/components/input";
 import { Label } from "@repo/shadcn-ui/components/label";
 import { SelectWithAction } from "@repo/shadcn-ui/components/select-with-action";
@@ -17,7 +17,7 @@ import { AssetInputSchema, AssetStatusSchema } from "../common/inventory";
 
 import { AssetCharacteristicControl } from "./asset-characteristic-control";
 import { BrandSelect } from "./brand-select";
-import { CatalogTemplateForm } from "./catalog-template-form";
+import { CatalogTemplateCreateDialog } from "./catalog-template-create-dialog";
 import { inventoryApi, inventoryKeys } from "./inventory-api";
 import { InventoryFeedback } from "./inventory-feedback";
 
@@ -294,32 +294,22 @@ export function AssetForm({
         </FormActions>
       </form>
       {creatingTemplate && (
-        <FormDialog
-          cancelLabel={t("cancel")}
-          formActions
+        <CatalogTemplateCreateDialog
+          csrfToken={csrfToken}
+          items={items}
           onOpenChange={(open) => {
             if (!open) {
               setCreatingTemplate(false);
             }
           }}
-          open
-          title={t("newTemplate")}
-          wide
-        >
-          <p className="text-sm text-muted-foreground">{t("relatedNotice")}</p>
-          <CatalogTemplateForm
-            allowQuickCreate={false}
-            csrfToken={csrfToken}
-            items={items}
-            onSaved={(id) => {
-              form.setValue("templateId", id);
-              form.setValue("characteristics", {});
-              form.setValue("brandId", null);
-              setCreatingTemplate(false);
-            }}
-            scope={companyId}
-          />
-        </FormDialog>
+          onSaved={(id) => {
+            form.setValue("templateId", id);
+            form.setValue("characteristics", {});
+            form.setValue("brandId", null);
+            setCreatingTemplate(false);
+          }}
+          scope={companyId}
+        />
       )}
     </>
   );
diff --git a/modules/assets/src/web/asset-relationships.tsx b/modules/assets/src/web/asset-relationships.tsx
index 3940029..5ffa5c1 100644
--- a/modules/assets/src/web/asset-relationships.tsx
+++ b/modules/assets/src/web/asset-relationships.tsx
@@ -1,14 +1,13 @@
 import { Button } from "@repo/shadcn-ui/components/button";
-import { FormActions, FormDialog } from "@repo/shadcn-ui/components/form-dialog";
-import { useMutation, useQuery, useQueryClient } from "@tanstack/react-query";
+import { useQuery } from "@tanstack/react-query";
 import { useState } from "react";
 import { useTranslation } from "react-i18next";
 
 import type { RelationshipDTO } from "../common";
 
+import { EndRelationshipDialog } from "./end-relationship-dialog";
 import { inventoryApi, inventoryKeys } from "./inventory-api";
-import { InventoryFeedback } from "./inventory-feedback";
-import { RelationshipForm } from "./relationship-form";
+import { RelationshipEditorDialog } from "./relationship-editor-dialog";
 
 export function AssetRelationships({
   companyId,
@@ -20,20 +19,13 @@ export function AssetRelationships({
   assetId: string;
 }) {
   const { t, i18n } = useTranslation("assets");
-  const client = useQueryClient();
   const query = useQuery({
     queryKey: inventoryKeys.company(companyId),
     queryFn: () => inventoryApi.get(companyId),
   });
   const [adding, setAdding] = useState(false);
-  const [ending, setEnding] = useState<RelationshipDTO>();
-  const mutation = useMutation({
-    mutationFn: (id: string) => inventoryApi.endRelationship(companyId, id, csrfToken),
-    onSuccess: async () => {
-      await client.invalidateQueries({ queryKey: inventoryKeys.company(companyId) });
-      setEnding(undefined);
-    },
-  });
+  const [endingId, setEndingId] = useState<string>();
+  const ending = query.data?.relationships.find((relationship) => relationship.id === endingId);
   const links = (query.data?.relationships ?? []).filter(
     (link) => link.values.sourceId === assetId || link.values.targetId === assetId
   );
@@ -66,8 +58,7 @@ export function AssetRelationships({
         ) : (
           <Button
             onClick={() => {
-              mutation.reset();
-              setEnding(link);
+              setEndingId(link.id);
             }}
             size="sm"
             variant="outline"
@@ -100,45 +91,23 @@ export function AssetRelationships({
         </details>
       )}
       {adding && (
-        <FormDialog
-          cancelLabel={t("cancel")}
-          formActions
+        <RelationshipEditorDialog
+          assetId={assetId}
+          companyId={companyId}
+          csrfToken={csrfToken}
           onOpenChange={setAdding}
-          open
-          title={t("linkAsset")}
-        >
-          <RelationshipForm
-            assetId={assetId}
-            companyId={companyId}
-            csrfToken={csrfToken}
-            onSaved={() => setAdding(false)}
-          />
-        </FormDialog>
+          onSaved={() => setAdding(false)}
+        />
       )}
       {ending && (
-        <FormDialog
-          cancelLabel={t("cancel")}
-          formActions
-          onOpenChange={(open) => {
-            if (!open) {
-              setEnding(undefined);
-            }
-          }}
-          open
-          title={t("endRelationship")}
-        >
-          <p className="text-sm">
-            {ending.values.name} · {nameOf(ending.values.sourceId)} →{" "}
-            {nameOf(ending.values.targetId)}
-          </p>
-          <p className="text-sm text-muted-foreground">{t("endRelationshipConfirm")}</p>
-          <InventoryFeedback error={mutation.error} />
-          <FormActions>
-            <Button disabled={mutation.isPending} onClick={() => mutation.mutate(ending.id)}>
-              {t("endRelationship")}
-            </Button>
-          </FormActions>
-        </FormDialog>
+        <EndRelationshipDialog
+          companyId={companyId}
+          csrfToken={csrfToken}
+          onClose={() => setEndingId(undefined)}
+          relationship={ending}
+          sourceName={nameOf(ending.values.sourceId)}
+          targetName={nameOf(ending.values.targetId)}
+        />
       )}
     </section>
   );
diff --git a/modules/assets/src/web/asset-support.tsx b/modules/assets/src/web/asset-support.tsx
index f00a08b..5c5da91 100644
--- a/modules/assets/src/web/asset-support.tsx
+++ b/modules/assets/src/web/asset-support.tsx
@@ -1,5 +1,4 @@
 import { Button } from "@repo/shadcn-ui/components/button";
-import { FormDialog } from "@repo/shadcn-ui/components/form-dialog";
 import { useQuery } from "@tanstack/react-query";
 import { useState } from "react";
 import { useTranslation } from "react-i18next";
@@ -7,10 +6,10 @@ import { useTranslation } from "react-i18next";
 import type { SupportConnectionDTO } from "../common/support";
 
 import { supportApi, supportKeys } from "./support-api";
-import { SupportForm } from "./support-form";
-import { SupportHistory } from "./support-history";
+import { SupportConnectionEditorDialog } from "./support-connection-editor-dialog";
+import { SupportHistoryDialog } from "./support-history-dialog";
 import { SupportSummary } from "./support-summary";
-import { SupportTools } from "./support-tools";
+import { SupportToolsDialog } from "./support-tools-dialog";
 
 export function AssetSupport({
   companyId,
@@ -32,7 +31,8 @@ export function AssetSupport({
   const [edit, setEdit] = useState<SupportConnectionDTO | undefined>();
   const [toolsOpen, setToolsOpen] = useState(false);
   const [showRetired, setShowRetired] = useState(false);
-  const [history, setHistory] = useState<SupportConnectionDTO | undefined>();
+  const [historyId, setHistoryId] = useState<string>();
+  const history = query.data?.connections.find((connection) => connection.id === historyId);
   const items =
     query.data?.connections.filter((item) => showRetired || item.values.state !== "retired") ?? [];
   const tools = query.data?.tools ?? [];
@@ -102,7 +102,7 @@ export function AssetSupport({
                     >
                       {t("edit")}
                     </Button>
-                    <Button onClick={() => setHistory(item)} size="sm" variant="outline">
+                    <Button onClick={() => setHistoryId(item.id)} size="sm" variant="outline">
                       {t("support.history")}
                     </Button>
                   </div>
@@ -111,43 +111,26 @@ export function AssetSupport({
           </ul>
         </>
       )}
-      <FormDialog
-        cancelLabel={t("cancel")}
-        formActions
+      <SupportConnectionEditorDialog
+        assetId={assetId}
+        companyId={companyId}
+        csrfToken={csrfToken}
+        edit={edit}
         onOpenChange={setOpen}
+        onSaved={() => setOpen(false)}
         open={open}
-        title={t(edit ? "support.edit" : "support.new")}
-      >
-        <SupportForm
-          assetId={assetId}
-          companyId={companyId}
-          csrfToken={csrfToken}
-          key={edit?.id ?? "new"}
-          tools={tools}
-          {...(edit ? { connection: edit } : {})}
-          onSaved={() => setOpen(false)}
-        />
-      </FormDialog>
-      <FormDialog
-        cancelLabel={t("cancel")}
-        onOpenChange={setToolsOpen}
-        open={toolsOpen}
-        title={t("support.tools")}
-      >
-        <SupportTools csrfToken={csrfToken} />
-      </FormDialog>
-      <FormDialog
-        cancelLabel={t("cancel")}
+        tools={tools}
+      />
+      <SupportToolsDialog csrfToken={csrfToken} onOpenChange={setToolsOpen} open={toolsOpen} />
+      <SupportHistoryDialog
+        history={history}
         onOpenChange={(value) => {
           if (!value) {
-            setHistory(undefined);
+            setHistoryId(undefined);
           }
         }}
-        open={Boolean(history)}
-        title={t("support.history")}
-      >
-        {history && <SupportHistory connection={history} tools={tools} />}
-      </FormDialog>
+        tools={tools}
+      />
     </section>
   );
 }
diff --git a/modules/assets/src/web/brand-api.ts b/modules/assets/src/web/brand-api.ts
index 03279f7..78f71c4 100644
--- a/modules/assets/src/web/brand-api.ts
+++ b/modules/assets/src/web/brand-api.ts
@@ -1,6 +1,7 @@
 import { z } from "zod/v4";
 
-import { type BrandInput, BrandResponseSchema, BrandsResponseSchema } from "../common/brands";
+import type { BrandInput } from "../common/brands";
+import { BrandResponseSchema, BrandsResponseSchema } from "../common/brands";
 export const brandKeys = { all: ["asset-brands"] as const };
 export class BrandApiError extends Error {
   constructor(public readonly code: string) {
diff --git a/modules/assets/src/web/brand-editor-dialog.tsx b/modules/assets/src/web/brand-editor-dialog.tsx
new file mode 100644
index 0000000..556a58c
--- /dev/null
+++ b/modules/assets/src/web/brand-editor-dialog.tsx
@@ -0,0 +1,30 @@
+import { FormDialog } from "@repo/shadcn-ui/components/form-dialog";
+import type { ComponentProps } from "react";
+import { useTranslation } from "react-i18next";
+
+import { BrandForm } from "./brand-form";
+
+export function BrandEditorDialog({
+  open,
+  onOpenChange,
+  ...formProps
+}: ComponentProps<typeof BrandForm> & {
+  open: boolean;
+  onOpenChange: (open: boolean) => void;
+}) {
+  const { t } = useTranslation("assets");
+  return (
+    <FormDialog
+      cancelLabel={t("cancel")}
+      formActions
+      onOpenChange={onOpenChange}
+      open={open}
+      title={t(formProps.brand ? "brands.edit" : "brands.new")}
+    >
+      {formProps.quickCreate && (
+        <p className="text-sm text-muted-foreground">{t("brands.quickNotice")}</p>
+      )}
+      <BrandForm {...formProps} key={formProps.brand?.id ?? "new"} />
+    </FormDialog>
+  );
+}
diff --git a/modules/assets/src/web/brand-form.tsx b/modules/assets/src/web/brand-form.tsx
index 227fa9f..a1207bc 100644
--- a/modules/assets/src/web/brand-form.tsx
+++ b/modules/assets/src/web/brand-form.tsx
@@ -9,7 +9,8 @@ import { useEffect, useId, useRef } from "react";
 import { useForm } from "react-hook-form";
 import { useTranslation } from "react-i18next";
 
-import { type BrandDTO, type BrandInput, BrandInputSchema } from "../common/brands";
+import type { BrandDTO, BrandInput } from "../common/brands";
+import { BrandInputSchema } from "../common/brands";
 
 import { BrandApiError, brandApi, brandKeys } from "./brand-api";
 
diff --git a/modules/assets/src/web/brand-select.tsx b/modules/assets/src/web/brand-select.tsx
index 46e8f60..04adea2 100644
--- a/modules/assets/src/web/brand-select.tsx
+++ b/modules/assets/src/web/brand-select.tsx
@@ -1,5 +1,4 @@
 import { Button } from "@repo/shadcn-ui/components/button";
-import { FormDialog } from "@repo/shadcn-ui/components/form-dialog";
 import { Label } from "@repo/shadcn-ui/components/label";
 import { SelectWithAction } from "@repo/shadcn-ui/components/select-with-action";
 import { useQuery } from "@tanstack/react-query";
@@ -9,7 +8,7 @@ import { useTranslation } from "react-i18next";
 import type { BrandDTO } from "../common/brands";
 
 import { brandApi, brandKeys } from "./brand-api";
-import { BrandForm } from "./brand-form";
+import { BrandEditorDialog } from "./brand-editor-dialog";
 
 const LEGACY = "legacy";
 export function BrandSelect({
@@ -88,23 +87,16 @@ export function BrandSelect({
         </div>
       )}
       {open && (
-        <FormDialog
-          cancelLabel={t("cancel")}
-          formActions
+        <BrandEditorDialog
+          csrfToken={csrfToken}
           onOpenChange={setOpen}
+          onSaved={(brand) => {
+            onChange(brand);
+            setOpen(false);
+          }}
           open
-          title={t("brands.new")}
-        >
-          <p className="text-sm text-muted-foreground">{t("brands.quickNotice")}</p>
-          <BrandForm
-            csrfToken={csrfToken}
-            onSaved={(brand) => {
-              onChange(brand);
-              setOpen(false);
-            }}
-            quickCreate
-          />
-        </FormDialog>
+          quickCreate
+        />
       )}
     </div>
   );
diff --git a/modules/assets/src/web/brands-page.tsx b/modules/assets/src/web/brands-page.tsx
index 86fbc51..cc08e98 100644
--- a/modules/assets/src/web/brands-page.tsx
+++ b/modules/assets/src/web/brands-page.tsx
@@ -6,7 +6,6 @@ import {
   EntityStatus,
   EntityTable,
 } from "@repo/shadcn-ui/components/entity-list";
-import { FormDialog } from "@repo/shadcn-ui/components/form-dialog";
 import { SelectWithAction } from "@repo/shadcn-ui/components/select-with-action";
 import { useQuery } from "@tanstack/react-query";
 import { useId, useState } from "react";
@@ -15,7 +14,7 @@ import { useTranslation } from "react-i18next";
 import type { BrandDTO } from "../common/brands";
 
 import { brandApi, brandKeys } from "./brand-api";
-import { BrandForm } from "./brand-form";
+import { BrandEditorDialog } from "./brand-editor-dialog";
 
 export function BrandCatalogPage({ csrfToken }: { csrfToken: string }) {
   const { t, i18n } = useTranslation("assets");
@@ -125,20 +124,13 @@ export function BrandCatalogPage({ csrfToken }: { csrfToken: string }) {
         title={t("brands.title")}
         unavailable={query.isError}
       />
-      <FormDialog
-        cancelLabel={t("cancel")}
-        formActions
+      <BrandEditorDialog
+        csrfToken={csrfToken}
         onOpenChange={setOpen}
         open={open}
-        title={t(edit ? "brands.edit" : "brands.new")}
-      >
-        <BrandForm
-          csrfToken={csrfToken}
-          key={edit?.id ?? "new"}
-          {...(edit ? { brand: edit } : {})}
-          onSaved={() => setOpen(false)}
-        />
-      </FormDialog>
+        {...(edit ? { brand: edit } : {})}
+        onSaved={() => setOpen(false)}
+      />
     </div>
   );
 }
diff --git a/modules/assets/src/web/catalog-editor-dialog.tsx b/modules/assets/src/web/catalog-editor-dialog.tsx
new file mode 100644
index 0000000..bd25914
--- /dev/null
+++ b/modules/assets/src/web/catalog-editor-dialog.tsx
@@ -0,0 +1,79 @@
+import { FormDialog } from "@repo/shadcn-ui/components/form-dialog";
+import { useTranslation } from "react-i18next";
+
+import type { CatalogItemDTO } from "../common";
+
+import { CatalogFieldForm } from "./catalog-form";
+import { CatalogRelationForm } from "./catalog-relation-form";
+import { CatalogTemplateForm } from "./catalog-template-form";
+
+export type CatalogEditor = {
+  kind: "field" | "template" | "relation";
+  item?: CatalogItemDTO;
+  copy?: CatalogItemDTO;
+};
+function editorTitle(editor: CatalogEditor) {
+  if (editor.kind === "field") {
+    return editor.item ? "editField" : "newField";
+  }
+  if (editor.kind === "relation") {
+    return editor.item ? "editRelation" : "newRelation";
+  }
+  return editor.item ? "editTemplate" : "newTemplate";
+}
+
+export function CatalogEditorDialog({
+  editor,
+  items,
+  scope,
+  csrfToken,
+  onClose,
+}: {
+  editor: CatalogEditor;
+  items: readonly CatalogItemDTO[];
+  scope: string;
+  csrfToken: string;
+  onClose: () => void;
+}) {
+  const { t } = useTranslation("assets");
+
+  return (
+    <FormDialog
+      cancelLabel={t("cancel")}
+      formActions
+      onOpenChange={(open) => {
+        if (!open) {
+          onClose();
+        }
+      }}
+      open
+      title={t(editorTitle(editor))}
+      wide={editor.kind === "template"}
+    >
+      {editor.kind === "field" ? (
+        <CatalogFieldForm
+          csrfToken={csrfToken}
+          item={editor.item}
+          onSaved={() => onClose()}
+          scope={scope}
+        />
+      ) : editor.kind === "relation" ? (
+        <CatalogRelationForm
+          csrfToken={csrfToken}
+          item={editor.item}
+          onSaved={() => onClose()}
+          scope={scope}
+        />
+      ) : (
+        <CatalogTemplateForm
+          copy={editor.copy}
+          csrfToken={csrfToken}
+          item={editor.item}
+          items={items}
+          onSaved={() => onClose()}
+          scope={scope}
+        />
+      )}
+    </FormDialog>
+  );
+}
diff --git a/modules/assets/src/web/catalog-field-create-dialog.tsx b/modules/assets/src/web/catalog-field-create-dialog.tsx
new file mode 100644
index 0000000..e6d2ae9
--- /dev/null
+++ b/modules/assets/src/web/catalog-field-create-dialog.tsx
@@ -0,0 +1,31 @@
+import { FormDialog } from "@repo/shadcn-ui/components/form-dialog";
+import { useTranslation } from "react-i18next";
+
+import { CatalogFieldForm } from "./catalog-form";
+
+export function CatalogFieldCreateDialog({
+  scope,
+  csrfToken,
+  onSaved,
+  onOpenChange,
+}: {
+  scope: string;
+  csrfToken: string;
+  onSaved: (id: string) => void;
+  onOpenChange: (open: boolean) => void;
+}) {
+  const { t } = useTranslation("assets");
+
+  return (
+    <FormDialog
+      cancelLabel={t("cancel")}
+      formActions
+      onOpenChange={onOpenChange}
+      open
+      title={t("newField")}
+    >
+      <p className="text-sm text-muted-foreground">{t("quickNotice")}</p>
+      <CatalogFieldForm csrfToken={csrfToken} onSaved={onSaved} scope={scope} />
+    </FormDialog>
+  );
+}
diff --git a/modules/assets/src/web/catalog-page.tsx b/modules/assets/src/web/catalog-page.tsx
index 4172920..b579c24 100644
--- a/modules/assets/src/web/catalog-page.tsx
+++ b/modules/assets/src/web/catalog-page.tsx
@@ -1,6 +1,5 @@
 import { Button } from "@repo/shadcn-ui/components/button";
 import { EntityListHeader, EntityTable } from "@repo/shadcn-ui/components/entity-list";
-import { FormDialog } from "@repo/shadcn-ui/components/form-dialog";
 import { useMutation, useQuery, useQueryClient } from "@tanstack/react-query";
 import { useState } from "react";
 import { useTranslation } from "react-i18next";
@@ -10,16 +9,9 @@ import type { CatalogItemDTO } from "../common";
 import { catalogApi, catalogKeys } from "./catalog-api";
 import { CatalogCell } from "./catalog-cell";
 import { CatalogDefinitionDialog } from "./catalog-definition-dialog";
+import type { CatalogEditor } from "./catalog-editor-dialog";
+import { CatalogEditorDialog } from "./catalog-editor-dialog";
 import { CatalogError } from "./catalog-error";
-import { CatalogFieldForm } from "./catalog-form";
-import { CatalogRelationForm } from "./catalog-relation-form";
-import { CatalogTemplateForm } from "./catalog-template-form";
-
-type Editor = {
-  kind: "field" | "template" | "relation";
-  item?: CatalogItemDTO;
-  copy?: CatalogItemDTO;
-};
 
 export function AssetCatalogPage({ scope, csrfToken }: { scope: string; csrfToken: string }) {
   const { t, i18n } = useTranslation("assets");
@@ -27,7 +19,7 @@ export function AssetCatalogPage({ scope, csrfToken }: { scope: string; csrfToke
   const [tab, setTab] = useState<"field" | "template" | "relation">("template");
   const [search, setSearch] = useState("");
   const [viewId, setViewId] = useState<string>();
-  const [editor, setEditor] = useState<Editor>();
+  const [editor, setEditor] = useState<CatalogEditor>();
   const query = useQuery({
     queryKey: catalogKeys.scope(scope),
     queryFn: () => catalogApi.get(scope),
@@ -196,54 +188,14 @@ export function AssetCatalogPage({ scope, csrfToken }: { scope: string; csrfToke
       />
       <CatalogDefinitionDialog item={view} items={items} onClose={() => setViewId(undefined)} />
       {editor && (
-        <FormDialog
-          cancelLabel={t("cancel")}
-          formActions
-          onOpenChange={(open) => {
-            if (!open) {
-              setEditor(undefined);
-            }
-          }}
-          open
-          title={t(editorTitle(editor))}
-          wide={editor.kind === "template"}
-        >
-          {editor.kind === "field" ? (
-            <CatalogFieldForm
-              csrfToken={csrfToken}
-              item={editor.item}
-              onSaved={() => setEditor(undefined)}
-              scope={scope}
-            />
-          ) : editor.kind === "relation" ? (
-            <CatalogRelationForm
-              csrfToken={csrfToken}
-              item={editor.item}
-              onSaved={() => setEditor(undefined)}
-              scope={scope}
-            />
-          ) : (
-            <CatalogTemplateForm
-              copy={editor.copy}
-              csrfToken={csrfToken}
-              item={editor.item}
-              items={items}
-              onSaved={() => setEditor(undefined)}
-              scope={scope}
-            />
-          )}
-        </FormDialog>
+        <CatalogEditorDialog
+          csrfToken={csrfToken}
+          editor={editor}
+          items={items}
+          onClose={() => setEditor(undefined)}
+          scope={scope}
+        />
       )}
     </div>
   );
 }
-
-function editorTitle(editor: Editor) {
-  if (editor.kind === "field") {
-    return editor.item ? "editField" : "newField";
-  }
-  if (editor.kind === "relation") {
-    return editor.item ? "editRelation" : "newRelation";
-  }
-  return editor.item ? "editTemplate" : "newTemplate";
-}
diff --git a/modules/assets/src/web/catalog-relation-create-dialog.tsx b/modules/assets/src/web/catalog-relation-create-dialog.tsx
new file mode 100644
index 0000000..a72d751
--- /dev/null
+++ b/modules/assets/src/web/catalog-relation-create-dialog.tsx
@@ -0,0 +1,31 @@
+import { FormDialog } from "@repo/shadcn-ui/components/form-dialog";
+import { useTranslation } from "react-i18next";
+
+import { CatalogRelationForm } from "./catalog-relation-form";
+
+export function CatalogRelationCreateDialog({
+  companyId,
+  csrfToken,
+  onSaved,
+  onOpenChange,
+}: {
+  companyId: string;
+  csrfToken: string;
+  onSaved: (id: string) => void;
+  onOpenChange: (open: boolean) => void;
+}) {
+  const { t } = useTranslation("assets");
+
+  return (
+    <FormDialog
+      cancelLabel={t("cancel")}
+      formActions
+      onOpenChange={onOpenChange}
+      open
+      title={t("newRelation")}
+    >
+      <p className="text-sm text-muted-foreground">{t("quickRelationNotice")}</p>
+      <CatalogRelationForm csrfToken={csrfToken} onSaved={onSaved} scope={companyId} />
+    </FormDialog>
+  );
+}
diff --git a/modules/assets/src/web/catalog-relation-form.tsx b/modules/assets/src/web/catalog-relation-form.tsx
index cd5b8ce..4de7279 100644
--- a/modules/assets/src/web/catalog-relation-form.tsx
+++ b/modules/assets/src/web/catalog-relation-form.tsx
@@ -9,7 +9,8 @@ import { useForm } from "react-hook-form";
 import { useTranslation } from "react-i18next";
 import type { z } from "zod/v4";
 
-import { AssetDefinitionSchema, type CatalogItemDTO } from "../common";
+import type { CatalogItemDTO } from "../common";
+import { AssetDefinitionSchema } from "../common";
 
 import { CatalogError } from "./catalog-error";
 import { CatalogHelp } from "./catalog-help";
diff --git a/modules/assets/src/web/catalog-template-create-dialog.tsx b/modules/assets/src/web/catalog-template-create-dialog.tsx
new file mode 100644
index 0000000..66b6d70
--- /dev/null
+++ b/modules/assets/src/web/catalog-template-create-dialog.tsx
@@ -0,0 +1,41 @@
+import { FormDialog } from "@repo/shadcn-ui/components/form-dialog";
+import type { ComponentProps } from "react";
+import { useTranslation } from "react-i18next";
+
+import { CatalogTemplateForm } from "./catalog-template-form";
+
+export function CatalogTemplateCreateDialog({
+  scope,
+  csrfToken,
+  items,
+  onSaved,
+  onOpenChange,
+}: {
+  scope: string;
+  csrfToken: string;
+  items: ComponentProps<typeof CatalogTemplateForm>["items"];
+  onSaved: (id: string) => void;
+  onOpenChange: (open: boolean) => void;
+}) {
+  const { t } = useTranslation("assets");
+
+  return (
+    <FormDialog
+      cancelLabel={t("cancel")}
+      formActions
+      onOpenChange={onOpenChange}
+      open
+      title={t("newTemplate")}
+      wide
+    >
+      <p className="text-sm text-muted-foreground">{t("relatedNotice")}</p>
+      <CatalogTemplateForm
+        allowQuickCreate={false}
+        csrfToken={csrfToken}
+        items={items}
+        onSaved={onSaved}
+        scope={scope}
+      />
+    </FormDialog>
+  );
+}
diff --git a/modules/assets/src/web/catalog-template-form.tsx b/modules/assets/src/web/catalog-template-form.tsx
index 4458345..b344bbe 100644
--- a/modules/assets/src/web/catalog-template-form.tsx
+++ b/modules/assets/src/web/catalog-template-form.tsx
@@ -1,7 +1,7 @@
 import { zodResolver } from "@hookform/resolvers/zod";
 import { Button } from "@repo/shadcn-ui/components/button";
 import { Checkbox } from "@repo/shadcn-ui/components/checkbox";
-import { FormActions, FormDialog } from "@repo/shadcn-ui/components/form-dialog";
+import { FormActions } from "@repo/shadcn-ui/components/form-dialog";
 import { Input } from "@repo/shadcn-ui/components/input";
 import { Label } from "@repo/shadcn-ui/components/label";
 import { SelectWithAction } from "@repo/shadcn-ui/components/select-with-action";
@@ -15,7 +15,7 @@ import type { CatalogItemDTO } from "../common";
 import { AssetDefinitionSchema } from "../common";
 
 import { CatalogError } from "./catalog-error";
-import { CatalogFieldForm } from "./catalog-form";
+import { CatalogFieldCreateDialog } from "./catalog-field-create-dialog";
 import { CatalogHelp } from "./catalog-help";
 import type { CatalogSaved } from "./use-catalog-save";
 import { useCatalogSave } from "./use-catalog-save";
@@ -173,27 +173,19 @@ export function CatalogTemplateForm({
         </FormActions>
       </form>
       {creatingField && (
-        <FormDialog
-          cancelLabel={t("cancel")}
-          formActions
+        <CatalogFieldCreateDialog
+          csrfToken={csrfToken}
           onOpenChange={(open) => {
             if (!open) {
               setCreatingField(false);
             }
           }}
-          open
-          title={t("newField")}
-        >
-          <p className="text-sm text-muted-foreground">{t("quickNotice")}</p>
-          <CatalogFieldForm
-            csrfToken={csrfToken}
-            onSaved={(fieldId) => {
-              add(fieldId);
-              setCreatingField(false);
-            }}
-            scope={scope}
-          />
-        </FormDialog>
+          onSaved={(fieldId) => {
+            add(fieldId);
+            setCreatingField(false);
+          }}
+          scope={scope}
+        />
       )}
     </>
   );
diff --git a/modules/assets/src/web/end-relationship-dialog.tsx b/modules/assets/src/web/end-relationship-dialog.tsx
new file mode 100644
index 0000000..5863383
--- /dev/null
+++ b/modules/assets/src/web/end-relationship-dialog.tsx
@@ -0,0 +1,60 @@
+import { Button } from "@repo/shadcn-ui/components/button";
+import { FormActions, FormDialog } from "@repo/shadcn-ui/components/form-dialog";
+import { useMutation, useQueryClient } from "@tanstack/react-query";
+import { useTranslation } from "react-i18next";
+
+import type { RelationshipDTO } from "../common";
+
+import { inventoryApi, inventoryKeys } from "./inventory-api";
+import { InventoryFeedback } from "./inventory-feedback";
+
+export function EndRelationshipDialog({
+  relationship,
+  companyId,
+  csrfToken,
+  sourceName,
+  targetName,
+  onClose,
+}: {
+  relationship: RelationshipDTO;
+  companyId: string;
+  csrfToken: string;
+  sourceName: string;
+  targetName: string;
+  onClose: () => void;
+}) {
+  const { t } = useTranslation("assets");
+  const client = useQueryClient();
+  const mutation = useMutation({
+    mutationFn: () => inventoryApi.endRelationship(companyId, relationship.id, csrfToken),
+    onSuccess: () => client.invalidateQueries({ queryKey: inventoryKeys.company(companyId) }),
+  });
+  return (
+    <FormDialog
+      cancelLabel={t("cancel")}
+      formActions
+      onOpenChange={(open) => {
+        if (!open) {
+          onClose();
+        }
+      }}
+      open
+      title={t("endRelationship")}
+    >
+      <p className="text-sm">
+        {relationship.values.name} · {sourceName} → {targetName}
+      </p>
+      <p className="text-sm text-muted-foreground">{t("endRelationshipConfirm")}</p>
+      <InventoryFeedback error={mutation.error} />
+      <FormActions>
+        <Button
+          disabled={mutation.isPending}
+          onClick={() => mutation.mutate(undefined, { onSuccess: onClose })}
+          type="button"
+        >
+          {t("endRelationship")}
+        </Button>
+      </FormActions>
+    </FormDialog>
+  );
+}
diff --git a/modules/assets/src/web/inventory-api.ts b/modules/assets/src/web/inventory-api.ts
index c0fecb3..705f851 100644
--- a/modules/assets/src/web/inventory-api.ts
+++ b/modules/assets/src/web/inventory-api.ts
@@ -2,8 +2,10 @@ import { z } from "zod/v4";
 
 import type { AssetInput } from "../common/inventory";
 import { AssetResponseSchema, InventoryResponseSchema } from "../common/inventory";
-import { type RelationshipInputDTO, RelationshipResponseSchema } from "../common/relationships";
-import { type WorkstationInput, WorkstationResponseSchema } from "../common/workstations";
+import type { RelationshipInputDTO } from "../common/relationships";
+import { RelationshipResponseSchema } from "../common/relationships";
+import type { WorkstationInput } from "../common/workstations";
+import { WorkstationResponseSchema } from "../common/workstations";
 export const inventoryKeys = { company: (id: string) => ["inventory", id] };
 export class InventoryApiError extends Error {
   constructor(public readonly code: string) {
diff --git a/modules/assets/src/web/inventory-page.tsx b/modules/assets/src/web/inventory-page.tsx
index 1658f92..7ee9d44 100644
--- a/modules/assets/src/web/inventory-page.tsx
+++ b/modules/assets/src/web/inventory-page.tsx
@@ -6,17 +6,14 @@ import {
   EntityStatus,
   EntityTable,
 } from "@repo/shadcn-ui/components/entity-list";
-import { FormDialog } from "@repo/shadcn-ui/components/form-dialog";
 import { useQuery } from "@tanstack/react-query";
 import { useState } from "react";
 import { useTranslation } from "react-i18next";
 
-import { AssetDetail } from "./asset-detail";
+import { AssetDetailDialog } from "./asset-detail-dialog";
+import { AssetEditorDialog } from "./asset-editor-dialog";
 import type { InventoryLookups } from "./asset-form";
-import { AssetForm } from "./asset-form";
-import { AssetRelationships } from "./asset-relationships";
 import { AssetSelectionPanel } from "./asset-selection-panel";
-import { AssetSupport } from "./asset-support";
 import { catalogApi, catalogKeys } from "./catalog-api";
 import { CatalogError } from "./catalog-error";
 import { inventoryApi, inventoryKeys } from "./inventory-api";
@@ -216,54 +213,28 @@ export function AssetInventoryPage({
         open={detailOpen}
       />
       {editor && catalog.data && (
-        <FormDialog
-          cancelLabel={t("cancel")}
-          formActions
-          onOpenChange={(open) => {
-            if (!open) {
-              setEditor(undefined);
-            }
+        <AssetEditorDialog
+          asset={edited}
+          companyId={companyId}
+          csrfToken={csrfToken}
+          items={catalog.data.items}
+          lookups={lookups}
+          onClose={() => setEditor(undefined)}
+          onSaved={(id) => {
+            setSelectedId(id);
+            setDetailOpen(true);
+            setEditor(undefined);
           }}
-          open
-          title={t(edited ? "editAsset" : "newAsset")}
-          wide
-        >
-          <AssetForm
-            asset={edited}
-            companyId={companyId}
-            csrfToken={csrfToken}
-            items={catalog.data.items}
-            lookups={lookups}
-            onSaved={(id) => {
-              setSelectedId(id);
-              setDetailOpen(true);
-              setEditor(undefined);
-            }}
-          />
-        </FormDialog>
+        />
       )}
       {viewed && (
-        <FormDialog
-          cancelLabel={t("close")}
-          onOpenChange={(open) => {
-            if (!open) {
-              setViewId(undefined);
-            }
-          }}
-          open
-          title={viewed.values.name}
-          wide
-        >
-          <AssetDetail asset={viewed} lookups={lookups}>
-            <AssetRelationships assetId={viewed.id} companyId={companyId} csrfToken={csrfToken} />
-            <AssetSupport
-              assetId={viewed.id}
-              companyId={companyId}
-              csrfToken={csrfToken}
-              retired={viewed.values.status === "retired"}
-            />
-          </AssetDetail>
-        </FormDialog>
+        <AssetDetailDialog
+          asset={viewed}
+          companyId={companyId}
+          csrfToken={csrfToken}
+          lookups={lookups}
+          onClose={() => setViewId(undefined)}
+        />
       )}
     </div>
   );
diff --git a/modules/assets/src/web/relationship-editor-dialog.tsx b/modules/assets/src/web/relationship-editor-dialog.tsx
new file mode 100644
index 0000000..8b09f72
--- /dev/null
+++ b/modules/assets/src/web/relationship-editor-dialog.tsx
@@ -0,0 +1,37 @@
+import { FormDialog } from "@repo/shadcn-ui/components/form-dialog";
+import { useTranslation } from "react-i18next";
+
+import { RelationshipForm } from "./relationship-form";
+
+export function RelationshipEditorDialog({
+  companyId,
+  assetId,
+  csrfToken,
+  onSaved,
+  onOpenChange,
+}: {
+  companyId: string;
+  assetId: string;
+  csrfToken: string;
+  onSaved: () => void;
+  onOpenChange: (open: boolean) => void;
+}) {
+  const { t } = useTranslation("assets");
+
+  return (
+    <FormDialog
+      cancelLabel={t("cancel")}
+      formActions
+      onOpenChange={onOpenChange}
+      open
+      title={t("linkAsset")}
+    >
+      <RelationshipForm
+        assetId={assetId}
+        companyId={companyId}
+        csrfToken={csrfToken}
+        onSaved={onSaved}
+      />
+    </FormDialog>
+  );
+}
diff --git a/modules/assets/src/web/relationship-form.tsx b/modules/assets/src/web/relationship-form.tsx
index 7fb54b6..9619d5b 100644
--- a/modules/assets/src/web/relationship-form.tsx
+++ b/modules/assets/src/web/relationship-form.tsx
@@ -1,6 +1,6 @@
 import { Button } from "@repo/shadcn-ui/components/button";
 import { ContextHelp } from "@repo/shadcn-ui/components/context-help";
-import { FormActions, FormDialog } from "@repo/shadcn-ui/components/form-dialog";
+import { FormActions } from "@repo/shadcn-ui/components/form-dialog";
 import { Label } from "@repo/shadcn-ui/components/label";
 import { SelectWithAction } from "@repo/shadcn-ui/components/select-with-action";
 import { Textarea } from "@repo/shadcn-ui/components/textarea";
@@ -11,7 +11,7 @@ import { useTranslation } from "react-i18next";
 import type { RelationshipInputDTO } from "../common";
 
 import { catalogApi, catalogKeys } from "./catalog-api";
-import { CatalogRelationForm } from "./catalog-relation-form";
+import { CatalogRelationCreateDialog } from "./catalog-relation-create-dialog";
 import { inventoryApi, inventoryKeys } from "./inventory-api";
 import { InventoryFeedback } from "./inventory-feedback";
 
@@ -112,23 +112,15 @@ export function RelationshipForm({
         </FormActions>
       </form>
       {quick && (
-        <FormDialog
-          cancelLabel={t("cancel")}
-          formActions
+        <CatalogRelationCreateDialog
+          companyId={companyId}
+          csrfToken={csrfToken}
           onOpenChange={setQuick}
-          open
-          title={t("newRelation")}
-        >
-          <p className="text-sm text-muted-foreground">{t("quickRelationNotice")}</p>
-          <CatalogRelationForm
-            csrfToken={csrfToken}
-            onSaved={(savedId) => {
-              setTypeId(savedId);
-              setQuick(false);
-            }}
-            scope={companyId}
-          />
-        </FormDialog>
+          onSaved={(savedId) => {
+            setTypeId(savedId);
+            setQuick(false);
+          }}
+        />
       )}
     </>
   );
diff --git a/modules/assets/src/web/support-api.ts b/modules/assets/src/web/support-api.ts
index b1738c3..a667b19 100644
--- a/modules/assets/src/web/support-api.ts
+++ b/modules/assets/src/web/support-api.ts
@@ -1,10 +1,9 @@
 import { z } from "zod/v4";
 
+import type { SupportInput, SupportToolInput } from "../common/support";
 import {
-  type SupportInput,
   SupportListSchema,
   SupportResponseSchema,
-  type SupportToolInput,
   SupportToolResponseSchema,
   SupportToolsSchema,
 } from "../common/support";
diff --git a/modules/assets/src/web/support-connection-editor-dialog.tsx b/modules/assets/src/web/support-connection-editor-dialog.tsx
new file mode 100644
index 0000000..c2a5e65
--- /dev/null
+++ b/modules/assets/src/web/support-connection-editor-dialog.tsx
@@ -0,0 +1,47 @@
+import { FormDialog } from "@repo/shadcn-ui/components/form-dialog";
+import type { ComponentProps } from "react";
+import { useTranslation } from "react-i18next";
+
+import { SupportForm } from "./support-form";
+
+export function SupportConnectionEditorDialog({
+  open,
+  edit,
+  companyId,
+  assetId,
+  csrfToken,
+  tools,
+  onSaved,
+  onOpenChange,
+}: {
+  open: boolean;
+  edit: ComponentProps<typeof SupportForm>["connection"];
+  companyId: string;
+  assetId: string;
+  csrfToken: string;
+  tools: ComponentProps<typeof SupportForm>["tools"];
+  onSaved: () => void;
+  onOpenChange: (open: boolean) => void;
+}) {
+  const { t } = useTranslation("assets");
+
+  return (
+    <FormDialog
+      cancelLabel={t("cancel")}
+      formActions
+      onOpenChange={onOpenChange}
+      open={open}
+      title={t(edit ? "support.edit" : "support.new")}
+    >
+      <SupportForm
+        assetId={assetId}
+        companyId={companyId}
+        csrfToken={csrfToken}
+        key={edit?.id ?? "new"}
+        tools={tools}
+        {...(edit ? { connection: edit } : {})}
+        onSaved={onSaved}
+      />
+    </FormDialog>
+  );
+}
diff --git a/modules/assets/src/web/support-form.tsx b/modules/assets/src/web/support-form.tsx
index 938a94e..382d7bd 100644
--- a/modules/assets/src/web/support-form.tsx
+++ b/modules/assets/src/web/support-form.tsx
@@ -1,6 +1,6 @@
 import { zodResolver } from "@hookform/resolvers/zod";
 import { Button } from "@repo/shadcn-ui/components/button";
-import { FormActions, FormDialog } from "@repo/shadcn-ui/components/form-dialog";
+import { FormActions } from "@repo/shadcn-ui/components/form-dialog";
 import { Input } from "@repo/shadcn-ui/components/input";
 import { Label } from "@repo/shadcn-ui/components/label";
 import { SelectWithAction } from "@repo/shadcn-ui/components/select-with-action";
@@ -9,17 +9,13 @@ import { useId, useState } from "react";
 import { useForm } from "react-hook-form";
 import { useTranslation } from "react-i18next";
 
-import {
-  type SupportConnectionDTO,
-  type SupportInput,
-  type SupportToolDTO,
-  SupportValuesSchema,
-} from "../common/support";
+import type { SupportConnectionDTO, SupportInput, SupportToolDTO } from "../common/support";
+import { SupportValuesSchema } from "../common/support";
 
 import { supportApi, supportKeys } from "./support-api";
 import { SupportFeedback } from "./support-feedback";
 import { SupportHelp } from "./support-help";
-import { SupportToolForm } from "./support-tool-form";
+import { SupportToolEditorDialog } from "./support-tool-editor-dialog";
 export function SupportForm({
   companyId,
   assetId,
@@ -135,21 +131,16 @@ export function SupportForm({
           </Button>
         </FormActions>
       </form>
-      <FormDialog
-        cancelLabel={t("cancel")}
-        formActions
+      <SupportToolEditorDialog
+        csrfToken={csrfToken}
+        edit={undefined}
         onOpenChange={setQuick}
+        onSaved={(id) => {
+          form.setValue("toolId", id);
+          setQuick(false);
+        }}
         open={quick}
-        title={t("support.newTool")}
-      >
-        <SupportToolForm
-          csrfToken={csrfToken}
-          onSaved={(id) => {
-            form.setValue("toolId", id);
-            setQuick(false);
-          }}
-        />
-      </FormDialog>
+      />
     </>
   );
 }
diff --git a/modules/assets/src/web/support-history-dialog.tsx b/modules/assets/src/web/support-history-dialog.tsx
new file mode 100644
index 0000000..fac62cf
--- /dev/null
+++ b/modules/assets/src/web/support-history-dialog.tsx
@@ -0,0 +1,44 @@
+import { FormDialog } from "@repo/shadcn-ui/components/form-dialog";
+import { useTranslation } from "react-i18next";
+
+import type { SupportConnectionDTO, SupportToolDTO } from "../common/support";
+
+import { SupportSummary } from "./support-summary";
+
+export function SupportHistoryDialog({
+  history,
+  tools,
+  onOpenChange,
+}: {
+  history: SupportConnectionDTO | undefined;
+  tools: readonly SupportToolDTO[];
+  onOpenChange: (open: boolean) => void;
+}) {
+  const { t, i18n } = useTranslation("assets");
+
+  return (
+    <FormDialog
+      cancelLabel={t("cancel")}
+      onOpenChange={onOpenChange}
+      open={Boolean(history)}
+      title={t("support.history")}
+    >
+      {history && (
+        <ol className="space-y-3">
+          {[...history.history].reverse().map((revision) => (
+            <li className="space-y-2 rounded-md border p-3" key={revision.id}>
+              <p className="text-sm">
+                {new Intl.DateTimeFormat(i18n.language, {
+                  dateStyle: "medium",
+                  timeStyle: "short",
+                }).format(new Date(revision.recordedAt))}{" "}
+                · {revision.actorName}
+              </p>
+              <SupportSummary tools={tools} values={revision.values} />
+            </li>
+          ))}
+        </ol>
+      )}
+    </FormDialog>
+  );
+}
diff --git a/modules/assets/src/web/support-history.tsx b/modules/assets/src/web/support-history.tsx
deleted file mode 100644
index 4a8fa9a..0000000
--- a/modules/assets/src/web/support-history.tsx
+++ /dev/null
@@ -1,31 +0,0 @@
-import { useTranslation } from "react-i18next";
-
-import type { SupportConnectionDTO, SupportToolDTO } from "../common/support";
-
-import { SupportSummary } from "./support-summary";
-
-export function SupportHistory({
-  connection,
-  tools,
-}: {
-  connection: SupportConnectionDTO;
-  tools: readonly SupportToolDTO[];
-}) {
-  const { i18n } = useTranslation("assets");
-  return (
-    <ol className="space-y-3">
-      {[...connection.history].reverse().map((revision) => (
-        <li className="space-y-2 rounded-md border p-3" key={revision.id}>
-          <p className="text-sm">
-            {new Intl.DateTimeFormat(i18n.language, {
-              dateStyle: "medium",
-              timeStyle: "short",
-            }).format(new Date(revision.recordedAt))}{" "}
-            · {revision.actorName}
-          </p>
-          <SupportSummary tools={tools} values={revision.values} />
-        </li>
-      ))}
-    </ol>
-  );
-}
diff --git a/modules/assets/src/web/support-tool-editor-dialog.tsx b/modules/assets/src/web/support-tool-editor-dialog.tsx
new file mode 100644
index 0000000..2adde63
--- /dev/null
+++ b/modules/assets/src/web/support-tool-editor-dialog.tsx
@@ -0,0 +1,38 @@
+import { FormDialog } from "@repo/shadcn-ui/components/form-dialog";
+import type { ComponentProps } from "react";
+import { useTranslation } from "react-i18next";
+
+import { SupportToolForm } from "./support-tool-form";
+
+export function SupportToolEditorDialog({
+  open,
+  edit,
+  csrfToken,
+  onSaved,
+  onOpenChange,
+}: {
+  open: boolean;
+  edit: ComponentProps<typeof SupportToolForm>["tool"];
+  csrfToken: string;
+  onSaved: ComponentProps<typeof SupportToolForm>["onSaved"];
+  onOpenChange: (open: boolean) => void;
+}) {
+  const { t } = useTranslation("assets");
+
+  return (
+    <FormDialog
+      cancelLabel={t("cancel")}
+      formActions
+      onOpenChange={onOpenChange}
+      open={open}
+      title={t(edit ? "support.editTool" : "support.newTool")}
+    >
+      <SupportToolForm
+        csrfToken={csrfToken}
+        key={edit?.id ?? "new"}
+        {...(edit ? { tool: edit } : {})}
+        onSaved={onSaved}
+      />
+    </FormDialog>
+  );
+}
diff --git a/modules/assets/src/web/support-tool-form.tsx b/modules/assets/src/web/support-tool-form.tsx
index ce54e65..e8b0b12 100644
--- a/modules/assets/src/web/support-tool-form.tsx
+++ b/modules/assets/src/web/support-tool-form.tsx
@@ -8,11 +8,8 @@ import { useId } from "react";
 import { useForm } from "react-hook-form";
 import { useTranslation } from "react-i18next";
 
-import {
-  type SupportToolDTO,
-  type SupportToolInput,
-  SupportToolInputSchema,
-} from "../common/support";
+import type { SupportToolDTO, SupportToolInput } from "../common/support";
+import { SupportToolInputSchema } from "../common/support";
 
 import { supportApi, supportKeys } from "./support-api";
 import { SupportFeedback } from "./support-feedback";
diff --git a/modules/assets/src/web/support-tools-dialog.tsx b/modules/assets/src/web/support-tools-dialog.tsx
new file mode 100644
index 0000000..65e9046
--- /dev/null
+++ b/modules/assets/src/web/support-tools-dialog.tsx
@@ -0,0 +1,27 @@
+import { FormDialog } from "@repo/shadcn-ui/components/form-dialog";
+import { useTranslation } from "react-i18next";
+
+import { SupportTools } from "./support-tools";
+
+export function SupportToolsDialog({
+  open,
+  csrfToken,
+  onOpenChange,
+}: {
+  open: boolean;
+  csrfToken: string;
+  onOpenChange: (open: boolean) => void;
+}) {
+  const { t } = useTranslation("assets");
+
+  return (
+    <FormDialog
+      cancelLabel={t("cancel")}
+      onOpenChange={onOpenChange}
+      open={open}
+      title={t("support.tools")}
+    >
+      <SupportTools csrfToken={csrfToken} />
+    </FormDialog>
+  );
+}
diff --git a/modules/assets/src/web/support-tools.tsx b/modules/assets/src/web/support-tools.tsx
index f6b7b4a..b2d4d30 100644
--- a/modules/assets/src/web/support-tools.tsx
+++ b/modules/assets/src/web/support-tools.tsx
@@ -6,7 +6,6 @@ import {
   EntityStatus,
   EntityTable,
 } from "@repo/shadcn-ui/components/entity-list";
-import { FormDialog } from "@repo/shadcn-ui/components/form-dialog";
 import { useQuery } from "@tanstack/react-query";
 import { useState } from "react";
 import { useTranslation } from "react-i18next";
@@ -14,7 +13,7 @@ import { useTranslation } from "react-i18next";
 import type { SupportToolDTO } from "../common/support";
 
 import { supportApi, supportKeys } from "./support-api";
-import { SupportToolForm } from "./support-tool-form";
+import { SupportToolEditorDialog } from "./support-tool-editor-dialog";
 export function SupportTools({ csrfToken }: { csrfToken: string }) {
   const { t, i18n } = useTranslation("assets");
   const query = useQuery({ queryKey: supportKeys.tools, queryFn: () => supportApi.tools() });
@@ -102,20 +101,13 @@ export function SupportTools({ csrfToken }: { csrfToken: string }) {
         title={t("support.tools")}
         unavailable={query.isError}
       />
-      <FormDialog
-        cancelLabel={t("cancel")}
-        formActions
+      <SupportToolEditorDialog
+        csrfToken={csrfToken}
+        edit={edit}
         onOpenChange={setOpen}
+        onSaved={() => setOpen(false)}
         open={open}
-        title={t(edit ? "support.editTool" : "support.newTool")}
-      >
-        <SupportToolForm
-          csrfToken={csrfToken}
-          key={edit?.id ?? "new"}
-          {...(edit ? { tool: edit } : {})}
-          onSaved={() => setOpen(false)}
-        />
-      </FormDialog>
+      />
     </div>
   );
 }
diff --git a/modules/assets/src/web/workstation-asset-create-dialog.tsx b/modules/assets/src/web/workstation-asset-create-dialog.tsx
new file mode 100644
index 0000000..7e207c4
--- /dev/null
+++ b/modules/assets/src/web/workstation-asset-create-dialog.tsx
@@ -0,0 +1,44 @@
+import { FormDialog } from "@repo/shadcn-ui/components/form-dialog";
+import type { ComponentProps } from "react";
+import { useTranslation } from "react-i18next";
+
+import { AssetForm } from "./asset-form";
+
+export function WorkstationAssetCreateDialog({
+  companyId,
+  csrfToken,
+  items,
+  lookups,
+  onSaved,
+  onOpenChange,
+}: {
+  companyId: string;
+  csrfToken: string;
+  items: ComponentProps<typeof AssetForm>["items"];
+  lookups: ComponentProps<typeof AssetForm>["lookups"];
+  onSaved: (id: string) => void;
+  onOpenChange: (open: boolean) => void;
+}) {
+  const { t } = useTranslation("assets");
+
+  return (
+    <FormDialog
+      cancelLabel={t("cancel")}
+      formActions
+      onOpenChange={onOpenChange}
+      open
+      title={t("newAsset")}
+      wide
+    >
+      <p className="text-sm text-muted-foreground">{t("relatedNotice")}</p>
+      <AssetForm
+        allowQuickCreate={false}
+        companyId={companyId}
+        csrfToken={csrfToken}
+        items={items}
+        lookups={lookups}
+        onSaved={onSaved}
+      />
+    </FormDialog>
+  );
+}
diff --git a/modules/assets/src/web/workstation-editor-dialog.tsx b/modules/assets/src/web/workstation-editor-dialog.tsx
new file mode 100644
index 0000000..b4d5204
--- /dev/null
+++ b/modules/assets/src/web/workstation-editor-dialog.tsx
@@ -0,0 +1,44 @@
+import { FormDialog } from "@repo/shadcn-ui/components/form-dialog";
+import type { ComponentProps } from "react";
+import { useTranslation } from "react-i18next";
+
+import { WorkstationForm } from "./workstation-form";
+
+export function WorkstationEditorDialog({
+  workstation,
+  companyId,
+  csrfToken,
+  lookups,
+  onClose,
+}: {
+  workstation: ComponentProps<typeof WorkstationForm>["workstation"];
+  companyId: string;
+  csrfToken: string;
+  lookups: ComponentProps<typeof WorkstationForm>["lookups"];
+  onClose: () => void;
+}) {
+  const { t } = useTranslation("assets");
+
+  return (
+    <FormDialog
+      cancelLabel={t("cancel")}
+      formActions
+      onOpenChange={(open) => {
+        if (!open) {
+          onClose();
+        }
+      }}
+      open
+      title={t(workstation ? "editWorkstation" : "newWorkstation")}
+      wide
+    >
+      <WorkstationForm
+        companyId={companyId}
+        csrfToken={csrfToken}
+        lookups={lookups}
+        onSaved={() => onClose()}
+        workstation={workstation}
+      />
+    </FormDialog>
+  );
+}
diff --git a/modules/assets/src/web/workstation-form.tsx b/modules/assets/src/web/workstation-form.tsx
index e9fc19c..929abb6 100644
--- a/modules/assets/src/web/workstation-form.tsx
+++ b/modules/assets/src/web/workstation-form.tsx
@@ -1,7 +1,7 @@
 import { zodResolver } from "@hookform/resolvers/zod";
 import { Button } from "@repo/shadcn-ui/components/button";
 import { ContextHelp } from "@repo/shadcn-ui/components/context-help";
-import { FormActions, FormDialog } from "@repo/shadcn-ui/components/form-dialog";
+import { FormActions } from "@repo/shadcn-ui/components/form-dialog";
 import { Input } from "@repo/shadcn-ui/components/input";
 import { Label } from "@repo/shadcn-ui/components/label";
 import { SelectWithAction } from "@repo/shadcn-ui/components/select-with-action";
@@ -10,13 +10,14 @@ import { useEffect, useId, useRef, useState } from "react";
 import { useForm } from "react-hook-form";
 import { useTranslation } from "react-i18next";
 
-import { type WorkstationDTO, type WorkstationInput, WorkstationInputSchema } from "../common";
+import type { WorkstationDTO, WorkstationInput } from "../common";
+import { WorkstationInputSchema } from "../common";
 
 import type { InventoryLookups } from "./asset-form";
-import { AssetForm } from "./asset-form";
 import { catalogApi, catalogKeys } from "./catalog-api";
 import { inventoryApi, inventoryKeys } from "./inventory-api";
 import { InventoryFeedback } from "./inventory-feedback";
+import { WorkstationAssetCreateDialog } from "./workstation-asset-create-dialog";
 export function WorkstationForm({
   companyId,
   csrfToken,
@@ -257,27 +258,17 @@ export function WorkstationForm({
         </FormActions>
       </form>
       {quick && catalog.data && (
-        <FormDialog
-          cancelLabel={t("cancel")}
-          formActions
+        <WorkstationAssetCreateDialog
+          companyId={companyId}
+          csrfToken={csrfToken}
+          items={catalog.data.items}
+          lookups={lookups}
           onOpenChange={setQuick}
-          open
-          title={t("newAsset")}
-          wide
-        >
-          <p className="text-sm text-muted-foreground">{t("relatedNotice")}</p>
-          <AssetForm
-            allowQuickCreate={false}
-            companyId={companyId}
-            csrfToken={csrfToken}
-            items={catalog.data.items}
-            lookups={lookups}
-            onSaved={(id) => {
-              add(quickField, id);
-              setQuick(false);
-            }}
-          />
-        </FormDialog>
+          onSaved={(id) => {
+            add(quickField, id);
+            setQuick(false);
+          }}
+        />
       )}
     </>
   );
diff --git a/modules/assets/src/web/workstation-history-dialog.tsx b/modules/assets/src/web/workstation-history-dialog.tsx
new file mode 100644
index 0000000..3719c6f
--- /dev/null
+++ b/modules/assets/src/web/workstation-history-dialog.tsx
@@ -0,0 +1,61 @@
+import { FormDialog } from "@repo/shadcn-ui/components/form-dialog";
+import { useTranslation } from "react-i18next";
+
+import type { WorkstationDTO } from "../common";
+
+export function WorkstationHistoryDialog({
+  workstation,
+  personName,
+  siteName,
+  members,
+  onClose,
+}: {
+  workstation: WorkstationDTO;
+  personName: (id: string | null) => string;
+  siteName: (id: string | null) => string;
+  members: (ids: readonly string[], empty?: string) => string;
+  onClose: () => void;
+}) {
+  const { t, i18n } = useTranslation("assets");
+
+  return (
+    <FormDialog
+      cancelLabel={t("close")}
+      onOpenChange={(open) => {
+        if (!open) {
+          onClose();
+        }
+      }}
+      open
+      title={t("workstationHistory")}
+      wide
+    >
+      <ol className="space-y-4">
+        {[...workstation.history].reverse().map((revision) => (
+          <li className="space-y-2 rounded-md border p-3 text-sm" key={revision.id}>
+            <p className="font-medium">
+              {new Intl.DateTimeFormat(i18n.language, {
+                dateStyle: "medium",
+                timeStyle: "short",
+              }).format(new Date(revision.recordedAt))}{" "}
+              · {t("recordedBy", { name: revision.actorName })}
+            </p>
+            <p>
+              {revision.values.name} · {t(revision.values.active ? "active" : "inactive")}
+            </p>
+            <p>
+              {siteName(revision.values.siteId)} · {personName(revision.values.personId)}
+            </p>
+            <p>
+              {t("exclusiveWorkstationAssets")}: {members(revision.values.assetIds)}
+            </p>
+            <p>
+              {t("sharedWorkstationAssets")}:{" "}
+              {members(revision.values.sharedAssetIds, "noSharedWorkstationAssets")}
+            </p>
+          </li>
+        ))}
+      </ol>
+    </FormDialog>
+  );
+}
diff --git a/modules/assets/src/web/workstations-page.tsx b/modules/assets/src/web/workstations-page.tsx
index abbde87..e565255 100644
--- a/modules/assets/src/web/workstations-page.tsx
+++ b/modules/assets/src/web/workstations-page.tsx
@@ -6,7 +6,6 @@ import {
   EntityStatus,
   EntityTable,
 } from "@repo/shadcn-ui/components/entity-list";
-import { FormDialog } from "@repo/shadcn-ui/components/form-dialog";
 import { useQuery } from "@tanstack/react-query";
 import { useState } from "react";
 import { useTranslation } from "react-i18next";
@@ -14,7 +13,8 @@ import { useTranslation } from "react-i18next";
 import type { InventoryLookups } from "./asset-form";
 import { inventoryApi, inventoryKeys } from "./inventory-api";
 import { InventoryFeedback } from "./inventory-feedback";
-import { WorkstationForm } from "./workstation-form";
+import { WorkstationEditorDialog } from "./workstation-editor-dialog";
+import { WorkstationHistoryDialog } from "./workstation-history-dialog";
 export function WorkstationsPage({
   companyId,
   csrfToken,
@@ -166,66 +166,22 @@ export function WorkstationsPage({
         />
       )}
       {editor && (
-        <FormDialog
-          cancelLabel={t("cancel")}
-          formActions
-          onOpenChange={(open) => {
-            if (!open) {
-              setEditor(undefined);
-            }
-          }}
-          open
-          title={t(edited ? "editWorkstation" : "newWorkstation")}
-          wide
-        >
-          <WorkstationForm
-            companyId={companyId}
-            csrfToken={csrfToken}
-            lookups={lookups}
-            onSaved={() => setEditor(undefined)}
-            workstation={edited}
-          />
-        </FormDialog>
+        <WorkstationEditorDialog
+          companyId={companyId}
+          csrfToken={csrfToken}
+          lookups={lookups}
+          onClose={() => setEditor(undefined)}
+          workstation={edited}
+        />
       )}
       {viewed && (
-        <FormDialog
-          cancelLabel={t("close")}
-          onOpenChange={(open) => {
-            if (!open) {
-              setView(undefined);
-            }
-          }}
-          open
-          title={t("workstationHistory")}
-          wide
-        >
-          <ol className="space-y-4">
-            {[...viewed.history].reverse().map((revision) => (
-              <li className="space-y-2 rounded-md border p-3 text-sm" key={revision.id}>
-                <p className="font-medium">
-                  {new Intl.DateTimeFormat(i18n.language, {
-                    dateStyle: "medium",
-                    timeStyle: "short",
-                  }).format(new Date(revision.recordedAt))}{" "}
-                  · {t("recordedBy", { name: revision.actorName })}
-                </p>
-                <p>
-                  {revision.values.name} · {t(revision.values.active ? "active" : "inactive")}
-                </p>
-                <p>
-                  {siteName(revision.values.siteId)} · {personName(revision.values.personId)}
-                </p>
-                <p>
-                  {t("exclusiveWorkstationAssets")}: {members(revision.values.assetIds)}
-                </p>
-                <p>
-                  {t("sharedWorkstationAssets")}:{" "}
-                  {members(revision.values.sharedAssetIds, "noSharedWorkstationAssets")}
-                </p>
-              </li>
-            ))}
-          </ol>
-        </FormDialog>
+        <WorkstationHistoryDialog
+          members={members}
+          onClose={() => setView(undefined)}
+          personName={personName}
+          siteName={siteName}
+          workstation={viewed}
+        />
       )}
     </div>
   );
diff --git a/modules/companies/src/api/application/application-configuration-input.mapper.ts b/modules/companies/src/api/application/application-configuration-input.mapper.ts
index c5bace5..b91be09 100644
--- a/modules/companies/src/api/application/application-configuration-input.mapper.ts
+++ b/modules/companies/src/api/application/application-configuration-input.mapper.ts
@@ -1,10 +1,8 @@
 import { Result } from "@repo/rdx-utils";
 
 import type { ApplicationConfiguration } from "../domain/application-configuration.aggregate";
-import {
-  ApplicationConfigurationError,
-  type ApplicationConfigurationInput,
-} from "../domain/application-configuration-values";
+import type { ApplicationConfigurationInput } from "../domain/application-configuration-values";
+import { ApplicationConfigurationError } from "../domain/application-configuration-values";
 import { ApplicationConfigurationValues } from "../domain/value-objects/application-configuration-values";
 
 import type { ApplicationContext } from "./application-configuration.repository";
diff --git a/modules/companies/src/api/application/application-configuration.use-cases.ts b/modules/companies/src/api/application/application-configuration.use-cases.ts
index f795b8e..45d7f7f 100644
--- a/modules/companies/src/api/application/application-configuration.use-cases.ts
+++ b/modules/companies/src/api/application/application-configuration.use-cases.ts
@@ -2,10 +2,8 @@ import { UniqueID } from "@repo/rdx-ddd";
 import { Result } from "@repo/rdx-utils";
 
 import { ApplicationConfiguration } from "../domain/application-configuration.aggregate";
-import {
-  ApplicationConfigurationError,
-  type ApplicationConfigurationInput,
-} from "../domain/application-configuration-values";
+import type { ApplicationConfigurationInput } from "../domain/application-configuration-values";
+import { ApplicationConfigurationError } from "../domain/application-configuration-values";
 
 import type { IApplicationConfigurationRepository } from "./application-configuration.repository";
 import { mapApplicationInput } from "./application-configuration-input.mapper";
diff --git a/modules/companies/src/api/application/certificate-configuration-input.mapper.ts b/modules/companies/src/api/application/certificate-configuration-input.mapper.ts
index 7726afd..fa6a4ac 100644
--- a/modules/companies/src/api/application/certificate-configuration-input.mapper.ts
+++ b/modules/companies/src/api/application/certificate-configuration-input.mapper.ts
@@ -1,10 +1,8 @@
 import { Result } from "@repo/rdx-utils";
 
 import type { CertificateConfiguration } from "../domain/certificate-configuration.aggregate";
-import {
-  CertificateConfigurationError,
-  type CertificateConfigurationInput,
-} from "../domain/certificate-configuration-values";
+import type { CertificateConfigurationInput } from "../domain/certificate-configuration-values";
+import { CertificateConfigurationError } from "../domain/certificate-configuration-values";
 import { CertificateConfigurationValues } from "../domain/value-objects/certificate-configuration-values";
 
 import type { CertificateContext } from "./certificate-configuration.repository";
diff --git a/modules/companies/src/api/application/certificate-configuration.use-cases.ts b/modules/companies/src/api/application/certificate-configuration.use-cases.ts
index c235418..7634ee7 100644
--- a/modules/companies/src/api/application/certificate-configuration.use-cases.ts
+++ b/modules/companies/src/api/application/certificate-configuration.use-cases.ts
@@ -2,10 +2,8 @@ import { UniqueID } from "@repo/rdx-ddd";
 import { Result } from "@repo/rdx-utils";
 
 import { CertificateConfiguration } from "../domain/certificate-configuration.aggregate";
-import {
-  CertificateConfigurationError,
-  type CertificateConfigurationInput,
-} from "../domain/certificate-configuration-values";
+import type { CertificateConfigurationInput } from "../domain/certificate-configuration-values";
+import { CertificateConfigurationError } from "../domain/certificate-configuration-values";
 
 import type { ICertificateConfigurationRepository } from "./certificate-configuration.repository";
 import { mapCertificateInput } from "./certificate-configuration-input.mapper";
diff --git a/modules/companies/src/api/application/folder-mapping-input.mapper.ts b/modules/companies/src/api/application/folder-mapping-input.mapper.ts
index 74082d9..e4d7b29 100644
--- a/modules/companies/src/api/application/folder-mapping-input.mapper.ts
+++ b/modules/companies/src/api/application/folder-mapping-input.mapper.ts
@@ -1,7 +1,8 @@
 import { Result } from "@repo/rdx-utils";
 
 import type { FolderMapping } from "../domain/folder-mapping.aggregate";
-import { FolderMappingError, type FolderMappingInput } from "../domain/folder-mapping-values";
+import type { FolderMappingInput } from "../domain/folder-mapping-values";
+import { FolderMappingError } from "../domain/folder-mapping-values";
 import { FolderMappingValues } from "../domain/value-objects/folder-mapping-values";
 
 import type { FolderContext } from "./folder-mapping.repository";
diff --git a/modules/companies/src/api/application/folder-mapping.use-cases.ts b/modules/companies/src/api/application/folder-mapping.use-cases.ts
index 64b34c2..40b1349 100644
--- a/modules/companies/src/api/application/folder-mapping.use-cases.ts
+++ b/modules/companies/src/api/application/folder-mapping.use-cases.ts
@@ -2,7 +2,8 @@ import { UniqueID } from "@repo/rdx-ddd";
 import { Result } from "@repo/rdx-utils";
 
 import { FolderMapping } from "../domain/folder-mapping.aggregate";
-import { FolderMappingError, type FolderMappingInput } from "../domain/folder-mapping-values";
+import type { FolderMappingInput } from "../domain/folder-mapping-values";
+import { FolderMappingError } from "../domain/folder-mapping-values";
 
 import type { IFolderMappingRepository } from "./folder-mapping.repository";
 import { mapFolderInput } from "./folder-mapping-input.mapper";
diff --git a/modules/companies/src/api/application/intervention-input.mapper.ts b/modules/companies/src/api/application/intervention-input.mapper.ts
index 03691e8..4b6b34a 100644
--- a/modules/companies/src/api/application/intervention-input.mapper.ts
+++ b/modules/companies/src/api/application/intervention-input.mapper.ts
@@ -1,7 +1,8 @@
 import { Result } from "@repo/rdx-utils";
 
 import type { Intervention } from "../domain/intervention.aggregate";
-import { InterventionError, type InterventionInput } from "../domain/intervention-values";
+import type { InterventionInput } from "../domain/intervention-values";
+import { InterventionError } from "../domain/intervention-values";
 import { InterventionValues } from "../domain/value-objects/intervention-values";
 
 import type { InterventionSaveContext } from "./intervention.repository";
diff --git a/modules/companies/src/api/application/intervention-template.use-cases.ts b/modules/companies/src/api/application/intervention-template.use-cases.ts
index 4529c80..8e843d3 100644
--- a/modules/companies/src/api/application/intervention-template.use-cases.ts
+++ b/modules/companies/src/api/application/intervention-template.use-cases.ts
@@ -1,10 +1,8 @@
 import { UniqueID } from "@repo/rdx-ddd";
 import { Maybe, Result } from "@repo/rdx-utils";
 
-import {
-  type SaveInterventionTemplateInput,
-  SaveInterventionTemplateSchema,
-} from "../../common/intervention-templates";
+import type { SaveInterventionTemplateInput } from "../../common/intervention-templates";
+import { SaveInterventionTemplateSchema } from "../../common/intervention-templates";
 import { InterventionTemplate } from "../domain/intervention-template.aggregate";
 import { InterventionTemplateError } from "../domain/intervention-template-values";
 import { InterventionTemplateValues } from "../domain/value-objects/intervention-template-values";
diff --git a/modules/companies/src/api/application/mail-configuration-input.mapper.ts b/modules/companies/src/api/application/mail-configuration-input.mapper.ts
index f2fcdd4..f56a1bb 100644
--- a/modules/companies/src/api/application/mail-configuration-input.mapper.ts
+++ b/modules/companies/src/api/application/mail-configuration-input.mapper.ts
@@ -2,10 +2,8 @@ import { UniqueID } from "@repo/rdx-ddd";
 import { Result } from "@repo/rdx-utils";
 
 import type { MailConfiguration } from "../domain/mail-configuration.aggregate";
-import {
-  MailConfigurationError,
-  type MailConfigurationInput,
-} from "../domain/mail-configuration-values";
+import type { MailConfigurationInput } from "../domain/mail-configuration-values";
+import { MailConfigurationError } from "../domain/mail-configuration-values";
 import { MailConfigurationValues } from "../domain/value-objects/mail-configuration-values";
 
 import type { MailContext } from "./mail-configuration.repository";
diff --git a/modules/companies/src/api/application/mail-configuration.use-cases.ts b/modules/companies/src/api/application/mail-configuration.use-cases.ts
index 41f1971..35eabe1 100644
--- a/modules/companies/src/api/application/mail-configuration.use-cases.ts
+++ b/modules/companies/src/api/application/mail-configuration.use-cases.ts
@@ -2,10 +2,8 @@ import { UniqueID } from "@repo/rdx-ddd";
 import { Result } from "@repo/rdx-utils";
 
 import { MailConfiguration } from "../domain/mail-configuration.aggregate";
-import {
-  MailConfigurationError,
-  type MailConfigurationInput,
-} from "../domain/mail-configuration-values";
+import type { MailConfigurationInput } from "../domain/mail-configuration-values";
+import { MailConfigurationError } from "../domain/mail-configuration-values";
 
 import type { IMailConfigurationRepository } from "./mail-configuration.repository";
 import { mapMailInput } from "./mail-configuration-input.mapper";
diff --git a/modules/companies/src/api/application/mailbox-input.mapper.ts b/modules/companies/src/api/application/mailbox-input.mapper.ts
index 5efccfc..943f233 100644
--- a/modules/companies/src/api/application/mailbox-input.mapper.ts
+++ b/modules/companies/src/api/application/mailbox-input.mapper.ts
@@ -2,7 +2,8 @@ import { Result } from "@repo/rdx-utils";
 
 import type { Mailbox } from "../domain/mailbox.aggregate";
 import type { MailboxUse } from "../domain/mailbox-use.aggregate";
-import { MailboxError, type MailboxInput, type MailboxUseInput } from "../domain/mailbox-values";
+import type { MailboxInput, MailboxUseInput } from "../domain/mailbox-values";
+import { MailboxError } from "../domain/mailbox-values";
 import { MailboxUseValues } from "../domain/value-objects/mailbox-use-values";
 import { MailboxValues } from "../domain/value-objects/mailbox-values";
 
diff --git a/modules/companies/src/api/application/mailbox.use-cases.ts b/modules/companies/src/api/application/mailbox.use-cases.ts
index b601737..23f637a 100644
--- a/modules/companies/src/api/application/mailbox.use-cases.ts
+++ b/modules/companies/src/api/application/mailbox.use-cases.ts
@@ -3,7 +3,8 @@ import { Result } from "@repo/rdx-utils";
 
 import { Mailbox } from "../domain/mailbox.aggregate";
 import { MailboxUse } from "../domain/mailbox-use.aggregate";
-import { MailboxError, type MailboxInput, type MailboxUseInput } from "../domain/mailbox-values";
+import type { MailboxInput, MailboxUseInput } from "../domain/mailbox-values";
+import { MailboxError } from "../domain/mailbox-values";
 
 import type { IMailboxRepository, MailboxContext } from "./mailbox.repository";
 import { mapMailboxInput, mapMailboxUseInput } from "./mailbox-input.mapper";
diff --git a/modules/companies/src/api/application/printer-configuration-input.mapper.ts b/modules/companies/src/api/application/printer-configuration-input.mapper.ts
index 4acef7b..6e70b71 100644
--- a/modules/companies/src/api/application/printer-configuration-input.mapper.ts
+++ b/modules/companies/src/api/application/printer-configuration-input.mapper.ts
@@ -1,10 +1,8 @@
 import { Result } from "@repo/rdx-utils";
 
 import type { PrinterConfiguration } from "../domain/printer-configuration.aggregate";
-import {
-  PrinterConfigurationError,
-  type PrinterConfigurationInput,
-} from "../domain/printer-configuration-values";
+import type { PrinterConfigurationInput } from "../domain/printer-configuration-values";
+import { PrinterConfigurationError } from "../domain/printer-configuration-values";
 import { PrinterConfigurationValues } from "../domain/value-objects/printer-configuration-values";
 
 import type { PrinterContext } from "./printer-configuration.repository";
diff --git a/modules/companies/src/api/application/printer-configuration.use-cases.ts b/modules/companies/src/api/application/printer-configuration.use-cases.ts
index 3821b28..bc0b19b 100644
--- a/modules/companies/src/api/application/printer-configuration.use-cases.ts
+++ b/modules/companies/src/api/application/printer-configuration.use-cases.ts
@@ -2,10 +2,8 @@ import { UniqueID } from "@repo/rdx-ddd";
 import { Result } from "@repo/rdx-utils";
 
 import { PrinterConfiguration } from "../domain/printer-configuration.aggregate";
-import {
-  PrinterConfigurationError,
-  type PrinterConfigurationInput,
-} from "../domain/printer-configuration-values";
+import type { PrinterConfigurationInput } from "../domain/printer-configuration-values";
+import { PrinterConfigurationError } from "../domain/printer-configuration-values";
 
 import type { IPrinterConfigurationRepository } from "./printer-configuration.repository";
 import { mapPrinterInput } from "./printer-configuration-input.mapper";
diff --git a/modules/companies/src/api/application/process.use-cases.ts b/modules/companies/src/api/application/process.use-cases.ts
index 1e6617d..d3a15dd 100644
--- a/modules/companies/src/api/application/process.use-cases.ts
+++ b/modules/companies/src/api/application/process.use-cases.ts
@@ -4,12 +4,12 @@ import { Maybe, Result } from "@repo/rdx-utils";
 import { PersonProcess } from "../domain/process.aggregate";
 import { ProcessTask } from "../domain/process-task.entity";
 import { ProcessTemplate } from "../domain/process-template.aggregate";
-import {
-  ProcessError,
-  type ProcessTemplateInput,
-  type StartProcessInput,
-  type UpdateProcessInput,
+import type {
+  ProcessTemplateInput,
+  StartProcessInput,
+  UpdateProcessInput,
 } from "../domain/process-values";
+import { ProcessError } from "../domain/process-values";
 import { ProcessTemplateValues } from "../domain/value-objects/process-template-values";
 import { ProcessValues } from "../domain/value-objects/process-values";
 
diff --git a/modules/companies/src/api/application/remote-connection-input.mapper.ts b/modules/companies/src/api/application/remote-connection-input.mapper.ts
index 7c5bef9..693bbac 100644
--- a/modules/companies/src/api/application/remote-connection-input.mapper.ts
+++ b/modules/companies/src/api/application/remote-connection-input.mapper.ts
@@ -1,10 +1,8 @@
 import { Result } from "@repo/rdx-utils";
 
 import type { RemoteConnection } from "../domain/remote-connection.aggregate";
-import {
-  RemoteConnectionError,
-  type RemoteConnectionInput,
-} from "../domain/remote-connection-values";
+import type { RemoteConnectionInput } from "../domain/remote-connection-values";
+import { RemoteConnectionError } from "../domain/remote-connection-values";
 import { RemoteConnectionValues } from "../domain/value-objects/remote-connection-values";
 
 import type { RemoteContext } from "./remote-connection.repository";
diff --git a/modules/companies/src/api/application/telework-authorization-input.mapper.ts b/modules/companies/src/api/application/telework-authorization-input.mapper.ts
index 476820f..98b5aa0 100644
--- a/modules/companies/src/api/application/telework-authorization-input.mapper.ts
+++ b/modules/companies/src/api/application/telework-authorization-input.mapper.ts
@@ -1,10 +1,8 @@
 import { Result } from "@repo/rdx-utils";
 
 import type { TeleworkAuthorization } from "../domain/telework-authorization.aggregate";
-import {
-  TeleworkAuthorizationError,
-  type TeleworkAuthorizationInput,
-} from "../domain/telework-authorization-values";
+import type { TeleworkAuthorizationInput } from "../domain/telework-authorization-values";
+import { TeleworkAuthorizationError } from "../domain/telework-authorization-values";
 import { TeleworkAuthorizationValues } from "../domain/value-objects/telework-authorization-values";
 
 import type { TeleworkAuthorizationContext } from "./telework-authorization.repository";
diff --git a/modules/companies/src/api/application/ticket-input.mapper.ts b/modules/companies/src/api/application/ticket-input.mapper.ts
index c11ec32..8c8ab95 100644
--- a/modules/companies/src/api/application/ticket-input.mapper.ts
+++ b/modules/companies/src/api/application/ticket-input.mapper.ts
@@ -1,10 +1,12 @@
 import { Result } from "@repo/rdx-utils";
 
 import type { Ticket } from "../domain/ticket.aggregate";
-import { TicketError, type TicketInput } from "../domain/ticket-values";
+import type { TicketInput } from "../domain/ticket-values";
+import { TicketError } from "../domain/ticket-values";
 import { TicketValues } from "../domain/value-objects/ticket-values";
 
-import { type TicketOption, type TicketSaveContext, targetOptions } from "./ticket.repository";
+import type { TicketOption, TicketSaveContext } from "./ticket.repository";
+import { targetOptions } from "./ticket.repository";
 
 function available(
   options: readonly TicketOption[],
diff --git a/modules/companies/src/api/application/work-profile-input.mapper.ts b/modules/companies/src/api/application/work-profile-input.mapper.ts
index a48f26f..388bb2c 100644
--- a/modules/companies/src/api/application/work-profile-input.mapper.ts
+++ b/modules/companies/src/api/application/work-profile-input.mapper.ts
@@ -2,7 +2,8 @@ import { Result } from "@repo/rdx-utils";
 
 import { WorkProfileValues } from "../domain/value-objects/work-profile-values";
 import type { WorkProfile } from "../domain/work-profile.aggregate";
-import { WorkProfileError, type WorkProfileInput } from "../domain/work-profile-values";
+import type { WorkProfileInput } from "../domain/work-profile-values";
+import { WorkProfileError } from "../domain/work-profile-values";
 
 import type { WorkProfileContext } from "./work-profile.repository";
 
diff --git a/modules/companies/src/api/domain/access/access-workspace.aggregate.ts b/modules/companies/src/api/domain/access/access-workspace.aggregate.ts
index d49f5f8..cf91378 100644
--- a/modules/companies/src/api/domain/access/access-workspace.aggregate.ts
+++ b/modules/companies/src/api/domain/access/access-workspace.aggregate.ts
@@ -1,4 +1,5 @@
-import { AggregateRoot, type UniqueID } from "@repo/rdx-ddd";
+import type { UniqueID } from "@repo/rdx-ddd";
+import { AggregateRoot } from "@repo/rdx-ddd";
 import type { Maybe } from "@repo/rdx-utils";
 import { Result } from "@repo/rdx-utils";
 
diff --git a/modules/companies/src/api/domain/application-configuration-revision.entity.ts b/modules/companies/src/api/domain/application-configuration-revision.entity.ts
index a9a699b..986dcfd 100644
--- a/modules/companies/src/api/domain/application-configuration-revision.entity.ts
+++ b/modules/companies/src/api/domain/application-configuration-revision.entity.ts
@@ -1,4 +1,5 @@
-import { DomainEntity, type UniqueID } from "@repo/rdx-ddd";
+import type { UniqueID } from "@repo/rdx-ddd";
+import { DomainEntity } from "@repo/rdx-ddd";
 
 import type { ApplicationConfigurationValues } from "./value-objects/application-configuration-values";
 export type ApplicationConfigurationRevisionProps = Readonly<{
diff --git a/modules/companies/src/api/domain/application-configuration.aggregate.ts b/modules/companies/src/api/domain/application-configuration.aggregate.ts
index fc18a05..dd5d9f3 100644
--- a/modules/companies/src/api/domain/application-configuration.aggregate.ts
+++ b/modules/companies/src/api/domain/application-configuration.aggregate.ts
@@ -1,4 +1,5 @@
-import { AggregateRoot, type UniqueID } from "@repo/rdx-ddd";
+import type { UniqueID } from "@repo/rdx-ddd";
+import { AggregateRoot } from "@repo/rdx-ddd";
 import { Result } from "@repo/rdx-utils";
 import { z } from "zod/v4";
 
diff --git a/modules/companies/src/api/domain/application-configuration.test.ts b/modules/companies/src/api/domain/application-configuration.test.ts
index b3d0596..b0c63e6 100644
--- a/modules/companies/src/api/domain/application-configuration.test.ts
+++ b/modules/companies/src/api/domain/application-configuration.test.ts
@@ -9,10 +9,8 @@ import { buildApplicationResponse } from "../application/application-configurati
 import { ApplicationConfigurationPersistenceMapper } from "../infrastructure/persistence/application-configuration-persistence.mapper";
 
 import { ApplicationConfiguration } from "./application-configuration.aggregate";
-import {
-  type ApplicationConfigurationInput,
-  ApplicationConfigurationInputSchema,
-} from "./application-configuration-values";
+import type { ApplicationConfigurationInput } from "./application-configuration-values";
+import { ApplicationConfigurationInputSchema } from "./application-configuration-values";
 import { ApplicationConfigurationValues } from "./value-objects/application-configuration-values";
 import { WorkProfileValues } from "./value-objects/work-profile-values";
 import { WorkProfile } from "./work-profile.aggregate";
diff --git a/modules/companies/src/api/domain/certificate-configuration-revision.entity.ts b/modules/companies/src/api/domain/certificate-configuration-revision.entity.ts
index 2a4a933..7085fdd 100644
--- a/modules/companies/src/api/domain/certificate-configuration-revision.entity.ts
+++ b/modules/companies/src/api/domain/certificate-configuration-revision.entity.ts
@@ -1,4 +1,5 @@
-import { DomainEntity, type UniqueID } from "@repo/rdx-ddd";
+import type { UniqueID } from "@repo/rdx-ddd";
+import { DomainEntity } from "@repo/rdx-ddd";
 
 import type { CertificateConfigurationValues } from "./value-objects/certificate-configuration-values";
 export type CertificateConfigurationRevisionProps = Readonly<{
diff --git a/modules/companies/src/api/domain/certificate-configuration.aggregate.ts b/modules/companies/src/api/domain/certificate-configuration.aggregate.ts
index c73e407..f80ba38 100644
--- a/modules/companies/src/api/domain/certificate-configuration.aggregate.ts
+++ b/modules/companies/src/api/domain/certificate-configuration.aggregate.ts
@@ -1,4 +1,5 @@
-import { AggregateRoot, type UniqueID } from "@repo/rdx-ddd";
+import type { UniqueID } from "@repo/rdx-ddd";
+import { AggregateRoot } from "@repo/rdx-ddd";
 import { Result } from "@repo/rdx-utils";
 import { z } from "zod/v4";
 
diff --git a/modules/companies/src/api/domain/certificate-configuration.test.ts b/modules/companies/src/api/domain/certificate-configuration.test.ts
index a860067..aee37c6 100644
--- a/modules/companies/src/api/domain/certificate-configuration.test.ts
+++ b/modules/companies/src/api/domain/certificate-configuration.test.ts
@@ -9,10 +9,8 @@ import { buildCertificateResponse } from "../application/certificate-configurati
 import { CertificateConfigurationPersistenceMapper } from "../infrastructure/persistence/certificate-configuration-persistence.mapper";
 
 import { CertificateConfiguration } from "./certificate-configuration.aggregate";
-import {
-  type CertificateConfigurationInput,
-  CertificateConfigurationInputSchema,
-} from "./certificate-configuration-values";
+import type { CertificateConfigurationInput } from "./certificate-configuration-values";
+import { CertificateConfigurationInputSchema } from "./certificate-configuration-values";
 import { CertificateConfigurationValues } from "./value-objects/certificate-configuration-values";
 import { WorkProfileValues } from "./value-objects/work-profile-values";
 import { WorkProfile } from "./work-profile.aggregate";
diff --git a/modules/companies/src/api/domain/folder-mapping-revision.entity.ts b/modules/companies/src/api/domain/folder-mapping-revision.entity.ts
index 0a4f4f9..996ffee 100644
--- a/modules/companies/src/api/domain/folder-mapping-revision.entity.ts
+++ b/modules/companies/src/api/domain/folder-mapping-revision.entity.ts
@@ -1,4 +1,5 @@
-import { DomainEntity, type UniqueID } from "@repo/rdx-ddd";
+import type { UniqueID } from "@repo/rdx-ddd";
+import { DomainEntity } from "@repo/rdx-ddd";
 
 import type { FolderMappingValues } from "./value-objects/folder-mapping-values";
 export type FolderMappingRevisionProps = Readonly<{
diff --git a/modules/companies/src/api/domain/folder-mapping.aggregate.ts b/modules/companies/src/api/domain/folder-mapping.aggregate.ts
index bc077ca..0d590a0 100644
--- a/modules/companies/src/api/domain/folder-mapping.aggregate.ts
+++ b/modules/companies/src/api/domain/folder-mapping.aggregate.ts
@@ -1,4 +1,5 @@
-import { AggregateRoot, type UniqueID } from "@repo/rdx-ddd";
+import type { UniqueID } from "@repo/rdx-ddd";
+import { AggregateRoot } from "@repo/rdx-ddd";
 import { Result } from "@repo/rdx-utils";
 import { z } from "zod/v4";
 
diff --git a/modules/companies/src/api/domain/intervention-revision.entity.ts b/modules/companies/src/api/domain/intervention-revision.entity.ts
index 8e5bb62..ff61703 100644
--- a/modules/companies/src/api/domain/intervention-revision.entity.ts
+++ b/modules/companies/src/api/domain/intervention-revision.entity.ts
@@ -1,4 +1,5 @@
-import { DomainEntity, type UniqueID } from "@repo/rdx-ddd";
+import type { UniqueID } from "@repo/rdx-ddd";
+import { DomainEntity } from "@repo/rdx-ddd";
 
 import type { InterventionValues } from "./value-objects/intervention-values";
 export type InterventionRevisionProps = Readonly<{
diff --git a/modules/companies/src/api/domain/intervention-step.entity.ts b/modules/companies/src/api/domain/intervention-step.entity.ts
index 51fac39..c0e4731 100644
--- a/modules/companies/src/api/domain/intervention-step.entity.ts
+++ b/modules/companies/src/api/domain/intervention-step.entity.ts
@@ -1,11 +1,8 @@
 import { DomainEntity, Name, UniqueID } from "@repo/rdx-ddd";
 import { Result } from "@repo/rdx-utils";
 
-import {
-  type InterventionCheckInput,
-  InterventionError,
-  InterventionStepSchema,
-} from "./intervention-values";
+import type { InterventionCheckInput } from "./intervention-values";
+import { InterventionError, InterventionStepSchema } from "./intervention-values";
 
 type Props = Readonly<{
   title: Name;
diff --git a/modules/companies/src/api/domain/intervention-template-revision.entity.ts b/modules/companies/src/api/domain/intervention-template-revision.entity.ts
index ec5a13f..46c0fcd 100644
--- a/modules/companies/src/api/domain/intervention-template-revision.entity.ts
+++ b/modules/companies/src/api/domain/intervention-template-revision.entity.ts
@@ -1,4 +1,5 @@
-import { DomainEntity, type UniqueID } from "@repo/rdx-ddd";
+import type { UniqueID } from "@repo/rdx-ddd";
+import { DomainEntity } from "@repo/rdx-ddd";
 import type { Maybe } from "@repo/rdx-utils";
 
 import type { InterventionTemplateValues } from "./value-objects/intervention-template-values";
diff --git a/modules/companies/src/api/domain/intervention-template-step.entity.ts b/modules/companies/src/api/domain/intervention-template-step.entity.ts
index 67c240e..acd2944 100644
--- a/modules/companies/src/api/domain/intervention-template-step.entity.ts
+++ b/modules/companies/src/api/domain/intervention-template-step.entity.ts
@@ -1,8 +1,8 @@
 import { DomainEntity, Name, UniqueID } from "@repo/rdx-ddd";
 import { Result } from "@repo/rdx-utils";
 
+import type { InterventionStepInput } from "./intervention-template-values";
 import {
-  type InterventionStepInput,
   InterventionStepInputSchema,
   InterventionTemplateError,
 } from "./intervention-template-values";
diff --git a/modules/companies/src/api/domain/intervention-template.aggregate.ts b/modules/companies/src/api/domain/intervention-template.aggregate.ts
index 48e1683..e80bd9a 100644
--- a/modules/companies/src/api/domain/intervention-template.aggregate.ts
+++ b/modules/companies/src/api/domain/intervention-template.aggregate.ts
@@ -1,4 +1,5 @@
-import { AggregateRoot, type UniqueID } from "@repo/rdx-ddd";
+import type { UniqueID } from "@repo/rdx-ddd";
+import { AggregateRoot } from "@repo/rdx-ddd";
 import { Maybe, Result } from "@repo/rdx-utils";
 import { z } from "zod/v4";
 
diff --git a/modules/companies/src/api/domain/intervention-template.test.ts b/modules/companies/src/api/domain/intervention-template.test.ts
index fae2a9a..2ad4193 100644
--- a/modules/companies/src/api/domain/intervention-template.test.ts
+++ b/modules/companies/src/api/domain/intervention-template.test.ts
@@ -9,10 +9,8 @@ import { InterventionTemplatePersistenceMapper } from "../infrastructure/persist
 
 import { InterventionTemplate } from "./intervention-template.aggregate";
 import { interventionTemplateSeeds } from "./intervention-template-seed";
-import {
-  type InterventionTemplateInput,
-  InterventionTemplateInputSchema,
-} from "./intervention-template-values";
+import type { InterventionTemplateInput } from "./intervention-template-values";
+import { InterventionTemplateInputSchema } from "./intervention-template-values";
 import { InterventionTemplateValues } from "./value-objects/intervention-template-values";
 
 const actor = UniqueID.generateNewID();
diff --git a/modules/companies/src/api/domain/intervention.aggregate.ts b/modules/companies/src/api/domain/intervention.aggregate.ts
index b5ba4ff..c6c5cd0 100644
--- a/modules/companies/src/api/domain/intervention.aggregate.ts
+++ b/modules/companies/src/api/domain/intervention.aggregate.ts
@@ -1,5 +1,7 @@
-import { AggregateRoot, type Name, type UniqueID } from "@repo/rdx-ddd";
-import { type Maybe, Result } from "@repo/rdx-utils";
+import type { Name, UniqueID } from "@repo/rdx-ddd";
+import { AggregateRoot } from "@repo/rdx-ddd";
+import type { Maybe } from "@repo/rdx-utils";
+import { Result } from "@repo/rdx-utils";
 import { z } from "zod/v4";
 
 import { InterventionRevision } from "./intervention-revision.entity";
diff --git a/modules/companies/src/api/domain/intervention.test.ts b/modules/companies/src/api/domain/intervention.test.ts
index 093c3da..da3bb0d 100644
--- a/modules/companies/src/api/domain/intervention.test.ts
+++ b/modules/companies/src/api/domain/intervention.test.ts
@@ -7,7 +7,8 @@ import { Maybe } from "@repo/rdx-utils";
 import { InterventionPersistenceMapper } from "../infrastructure/persistence/intervention-persistence.mapper";
 
 import { Intervention } from "./intervention.aggregate";
-import { type InterventionInput, InterventionInputSchema } from "./intervention-values";
+import type { InterventionInput } from "./intervention-values";
+import { InterventionInputSchema } from "./intervention-values";
 import { InterventionProcedure } from "./value-objects/intervention-procedure";
 import { InterventionValues } from "./value-objects/intervention-values";
 
diff --git a/modules/companies/src/api/domain/mail-configuration-revision.entity.ts b/modules/companies/src/api/domain/mail-configuration-revision.entity.ts
index 9945ad8..0fe8d03 100644
--- a/modules/companies/src/api/domain/mail-configuration-revision.entity.ts
+++ b/modules/companies/src/api/domain/mail-configuration-revision.entity.ts
@@ -1,4 +1,5 @@
-import { DomainEntity, type UniqueID } from "@repo/rdx-ddd";
+import type { UniqueID } from "@repo/rdx-ddd";
+import { DomainEntity } from "@repo/rdx-ddd";
 
 import type { MailConfigurationValues } from "./value-objects/mail-configuration-values";
 export type MailRevisionProps = Readonly<{
diff --git a/modules/companies/src/api/domain/mail-configuration.aggregate.ts b/modules/companies/src/api/domain/mail-configuration.aggregate.ts
index 6263feb..29cb928 100644
--- a/modules/companies/src/api/domain/mail-configuration.aggregate.ts
+++ b/modules/companies/src/api/domain/mail-configuration.aggregate.ts
@@ -1,4 +1,5 @@
-import { AggregateRoot, type UniqueID } from "@repo/rdx-ddd";
+import type { UniqueID } from "@repo/rdx-ddd";
+import { AggregateRoot } from "@repo/rdx-ddd";
 import { Result } from "@repo/rdx-utils";
 import { z } from "zod/v4";
 
diff --git a/modules/companies/src/api/domain/mailbox-revision.entity.ts b/modules/companies/src/api/domain/mailbox-revision.entity.ts
index f209ce5..7a4c631 100644
--- a/modules/companies/src/api/domain/mailbox-revision.entity.ts
+++ b/modules/companies/src/api/domain/mailbox-revision.entity.ts
@@ -1,4 +1,5 @@
-import { DomainEntity, type UniqueID } from "@repo/rdx-ddd";
+import type { UniqueID } from "@repo/rdx-ddd";
+import { DomainEntity } from "@repo/rdx-ddd";
 
 import type { MailboxValues } from "./value-objects/mailbox-values";
 export type MailboxRevisionProps = Readonly<{
diff --git a/modules/companies/src/api/domain/mailbox-use-revision.entity.ts b/modules/companies/src/api/domain/mailbox-use-revision.entity.ts
index 77652f7..6a3a582 100644
--- a/modules/companies/src/api/domain/mailbox-use-revision.entity.ts
+++ b/modules/companies/src/api/domain/mailbox-use-revision.entity.ts
@@ -1,4 +1,5 @@
-import { DomainEntity, type UniqueID } from "@repo/rdx-ddd";
+import type { UniqueID } from "@repo/rdx-ddd";
+import { DomainEntity } from "@repo/rdx-ddd";
 
 import type { MailboxUseValues } from "./value-objects/mailbox-use-values";
 export type MailboxUseRevisionProps = Readonly<{
diff --git a/modules/companies/src/api/domain/mailbox-use.aggregate.ts b/modules/companies/src/api/domain/mailbox-use.aggregate.ts
index c5b361b..e25d226 100644
--- a/modules/companies/src/api/domain/mailbox-use.aggregate.ts
+++ b/modules/companies/src/api/domain/mailbox-use.aggregate.ts
@@ -1,4 +1,5 @@
-import { AggregateRoot, type UniqueID } from "@repo/rdx-ddd";
+import type { UniqueID } from "@repo/rdx-ddd";
+import { AggregateRoot } from "@repo/rdx-ddd";
 import { Result } from "@repo/rdx-utils";
 import { z } from "zod/v4";
 
diff --git a/modules/companies/src/api/domain/mailbox.aggregate.ts b/modules/companies/src/api/domain/mailbox.aggregate.ts
index 37b6e54..8838272 100644
--- a/modules/companies/src/api/domain/mailbox.aggregate.ts
+++ b/modules/companies/src/api/domain/mailbox.aggregate.ts
@@ -1,4 +1,5 @@
-import { AggregateRoot, type UniqueID } from "@repo/rdx-ddd";
+import type { UniqueID } from "@repo/rdx-ddd";
+import { AggregateRoot } from "@repo/rdx-ddd";
 import { Result } from "@repo/rdx-utils";
 import { z } from "zod/v4";
 
diff --git a/modules/companies/src/api/domain/printer-configuration-revision.entity.ts b/modules/companies/src/api/domain/printer-configuration-revision.entity.ts
index f5f3f13..1c33af4 100644
--- a/modules/companies/src/api/domain/printer-configuration-revision.entity.ts
+++ b/modules/companies/src/api/domain/printer-configuration-revision.entity.ts
@@ -1,4 +1,5 @@
-import { DomainEntity, type UniqueID } from "@repo/rdx-ddd";
+import type { UniqueID } from "@repo/rdx-ddd";
+import { DomainEntity } from "@repo/rdx-ddd";
 
 import type { PrinterConfigurationValues } from "./value-objects/printer-configuration-values";
 export type PrinterConfigurationRevisionProps = Readonly<{
diff --git a/modules/companies/src/api/domain/printer-configuration.aggregate.ts b/modules/companies/src/api/domain/printer-configuration.aggregate.ts
index 2876d5b..e7848e3 100644
--- a/modules/companies/src/api/domain/printer-configuration.aggregate.ts
+++ b/modules/companies/src/api/domain/printer-configuration.aggregate.ts
@@ -1,4 +1,5 @@
-import { AggregateRoot, type UniqueID } from "@repo/rdx-ddd";
+import type { UniqueID } from "@repo/rdx-ddd";
+import { AggregateRoot } from "@repo/rdx-ddd";
 import { Result } from "@repo/rdx-utils";
 import { z } from "zod/v4";
 
diff --git a/modules/companies/src/api/domain/printer-configuration.test.ts b/modules/companies/src/api/domain/printer-configuration.test.ts
index 4b1e1be..d6e0729 100644
--- a/modules/companies/src/api/domain/printer-configuration.test.ts
+++ b/modules/companies/src/api/domain/printer-configuration.test.ts
@@ -9,10 +9,8 @@ import { buildPrinterResponse } from "../application/printer-configuration-respo
 import { PrinterConfigurationPersistenceMapper } from "../infrastructure/persistence/printer-configuration-persistence.mapper";
 
 import { PrinterConfiguration } from "./printer-configuration.aggregate";
-import {
-  type PrinterConfigurationInput,
-  PrinterConfigurationInputSchema,
-} from "./printer-configuration-values";
+import type { PrinterConfigurationInput } from "./printer-configuration-values";
+import { PrinterConfigurationInputSchema } from "./printer-configuration-values";
 import { PrinterConfigurationValues } from "./value-objects/printer-configuration-values";
 import { WorkProfileValues } from "./value-objects/work-profile-values";
 import { WorkProfile } from "./work-profile.aggregate";
diff --git a/modules/companies/src/api/domain/process-revision.entity.ts b/modules/companies/src/api/domain/process-revision.entity.ts
index e413990..783d16e 100644
--- a/modules/companies/src/api/domain/process-revision.entity.ts
+++ b/modules/companies/src/api/domain/process-revision.entity.ts
@@ -1,4 +1,5 @@
-import { DomainEntity, type UniqueID } from "@repo/rdx-ddd";
+import type { UniqueID } from "@repo/rdx-ddd";
+import { DomainEntity } from "@repo/rdx-ddd";
 import type { Maybe } from "@repo/rdx-utils";
 
 import type { ProcessValues } from "./value-objects/process-values";
diff --git a/modules/companies/src/api/domain/process-task.entity.ts b/modules/companies/src/api/domain/process-task.entity.ts
index 9907b86..621fa11 100644
--- a/modules/companies/src/api/domain/process-task.entity.ts
+++ b/modules/companies/src/api/domain/process-task.entity.ts
@@ -1,12 +1,8 @@
 import { DomainEntity, Name, UniqueID } from "@repo/rdx-ddd";
 import { Maybe } from "@repo/rdx-utils";
 
-import {
-  type ProcessReferenceInput,
-  ProcessReferenceSchema,
-  type ProcessTaskInput,
-  ProcessTaskSchema,
-} from "./process-values";
+import type { ProcessReferenceInput, ProcessTaskInput } from "./process-values";
+import { ProcessReferenceSchema, ProcessTaskSchema } from "./process-values";
 
 class ProcessReferenceValues {
   private constructor(
diff --git a/modules/companies/src/api/domain/process-template-revision.entity.ts b/modules/companies/src/api/domain/process-template-revision.entity.ts
index b1d1116..9f04c0f 100644
--- a/modules/companies/src/api/domain/process-template-revision.entity.ts
+++ b/modules/companies/src/api/domain/process-template-revision.entity.ts
@@ -1,4 +1,5 @@
-import { DomainEntity, type UniqueID } from "@repo/rdx-ddd";
+import type { UniqueID } from "@repo/rdx-ddd";
+import { DomainEntity } from "@repo/rdx-ddd";
 import type { Maybe } from "@repo/rdx-utils";
 
 import type { ProcessTemplateValues } from "./value-objects/process-template-values";
diff --git a/modules/companies/src/api/domain/process-template.aggregate.ts b/modules/companies/src/api/domain/process-template.aggregate.ts
index 8c687b4..bb99288 100644
--- a/modules/companies/src/api/domain/process-template.aggregate.ts
+++ b/modules/companies/src/api/domain/process-template.aggregate.ts
@@ -1,4 +1,5 @@
-import { AggregateRoot, type UniqueID } from "@repo/rdx-ddd";
+import type { UniqueID } from "@repo/rdx-ddd";
+import { AggregateRoot } from "@repo/rdx-ddd";
 import { Maybe, Result } from "@repo/rdx-utils";
 import { z } from "zod/v4";
 
diff --git a/modules/companies/src/api/domain/process.aggregate.ts b/modules/companies/src/api/domain/process.aggregate.ts
index 0a55707..dcec9bf 100644
--- a/modules/companies/src/api/domain/process.aggregate.ts
+++ b/modules/companies/src/api/domain/process.aggregate.ts
@@ -1,10 +1,12 @@
-import { AggregateRoot, type UniqueID } from "@repo/rdx-ddd";
+import type { UniqueID } from "@repo/rdx-ddd";
+import { AggregateRoot } from "@repo/rdx-ddd";
 import { Maybe, Result } from "@repo/rdx-utils";
 import { z } from "zod/v4";
 
 import { PersonProcessRevision } from "./process-revision.entity";
 import { ProcessTask } from "./process-task.entity";
-import { ProcessError, type ProcessReferenceInput } from "./process-values";
+import type { ProcessReferenceInput } from "./process-values";
+import { ProcessError } from "./process-values";
 import { ProcessValues } from "./value-objects/process-values";
 
 type Props = Readonly<{
diff --git a/modules/companies/src/api/domain/process.test.ts b/modules/companies/src/api/domain/process.test.ts
index deee67d..f4046be 100644
--- a/modules/companies/src/api/domain/process.test.ts
+++ b/modules/companies/src/api/domain/process.test.ts
@@ -4,18 +4,16 @@ import { test } from "node:test";
 import { UniqueID } from "@repo/rdx-ddd";
 import { Maybe } from "@repo/rdx-utils";
 
-import {
-  type ProcessReviewSources,
-  buildProcessReview,
-} from "../application/process-review.builder";
+import type { ProcessReviewSources } from "../application/process-review.builder";
+import { buildProcessReview } from "../application/process-review.builder";
 import { PersonProcessPersistenceMapper } from "../infrastructure/persistence/process-persistence.mapper";
 
 import { PersonProcess } from "./process.aggregate";
 import { ProcessTask } from "./process-task.entity";
 import { ProcessTemplate } from "./process-template.aggregate";
+import type { ProcessValuesInput } from "./process-values";
 import {
   ProcessTemplateInputSchema,
-  type ProcessValuesInput,
   ProcessValuesSchema,
   StartProcessInputSchema,
 } from "./process-values";
diff --git a/modules/companies/src/api/domain/remote-connection-revision.entity.ts b/modules/companies/src/api/domain/remote-connection-revision.entity.ts
index 6342bc1..8880e48 100644
--- a/modules/companies/src/api/domain/remote-connection-revision.entity.ts
+++ b/modules/companies/src/api/domain/remote-connection-revision.entity.ts
@@ -1,4 +1,5 @@
-import { DomainEntity, type UniqueID } from "@repo/rdx-ddd";
+import type { UniqueID } from "@repo/rdx-ddd";
+import { DomainEntity } from "@repo/rdx-ddd";
 
 import type { RemoteConnectionValues } from "./value-objects/remote-connection-values";
 export type RemoteConnectionRevisionProps = Readonly<{
diff --git a/modules/companies/src/api/domain/remote-connection.aggregate.ts b/modules/companies/src/api/domain/remote-connection.aggregate.ts
index 8714c84..b29f56e 100644
--- a/modules/companies/src/api/domain/remote-connection.aggregate.ts
+++ b/modules/companies/src/api/domain/remote-connection.aggregate.ts
@@ -1,4 +1,5 @@
-import { AggregateRoot, type UniqueID } from "@repo/rdx-ddd";
+import type { UniqueID } from "@repo/rdx-ddd";
+import { AggregateRoot } from "@repo/rdx-ddd";
 import { Result } from "@repo/rdx-utils";
 import { z } from "zod/v4";
 
diff --git a/modules/companies/src/api/domain/remote-connection.test.ts b/modules/companies/src/api/domain/remote-connection.test.ts
index f5efd2b..e1c708e 100644
--- a/modules/companies/src/api/domain/remote-connection.test.ts
+++ b/modules/companies/src/api/domain/remote-connection.test.ts
@@ -9,10 +9,8 @@ import { remoteNeedsReview } from "../application/remote-connection-policy";
 import { RemoteConnectionPersistenceMapper } from "../infrastructure/persistence/remote-connection-persistence.mapper";
 
 import { RemoteConnection } from "./remote-connection.aggregate";
-import {
-  type RemoteConnectionInput,
-  RemoteConnectionInputSchema,
-} from "./remote-connection-values";
+import type { RemoteConnectionInput } from "./remote-connection-values";
+import { RemoteConnectionInputSchema } from "./remote-connection-values";
 import { TeleworkAuthorization } from "./telework-authorization.aggregate";
 import { RemoteConnectionValues } from "./value-objects/remote-connection-values";
 import { TeleworkAuthorizationValues } from "./value-objects/telework-authorization-values";
diff --git a/modules/companies/src/api/domain/telework-authorization-revision.entity.ts b/modules/companies/src/api/domain/telework-authorization-revision.entity.ts
index 52fde28..e5d4429 100644
--- a/modules/companies/src/api/domain/telework-authorization-revision.entity.ts
+++ b/modules/companies/src/api/domain/telework-authorization-revision.entity.ts
@@ -1,4 +1,5 @@
-import { DomainEntity, type UniqueID } from "@repo/rdx-ddd";
+import type { UniqueID } from "@repo/rdx-ddd";
+import { DomainEntity } from "@repo/rdx-ddd";
 
 import type { TeleworkAuthorizationValues } from "./value-objects/telework-authorization-values";
 export type TeleworkAuthorizationRevisionProps = Readonly<{
diff --git a/modules/companies/src/api/domain/telework-authorization.aggregate.ts b/modules/companies/src/api/domain/telework-authorization.aggregate.ts
index 6591344..ed1f9c4 100644
--- a/modules/companies/src/api/domain/telework-authorization.aggregate.ts
+++ b/modules/companies/src/api/domain/telework-authorization.aggregate.ts
@@ -1,4 +1,5 @@
-import { AggregateRoot, type UniqueID } from "@repo/rdx-ddd";
+import type { UniqueID } from "@repo/rdx-ddd";
+import { AggregateRoot } from "@repo/rdx-ddd";
 import { Result } from "@repo/rdx-utils";
 import { z } from "zod/v4";
 
diff --git a/modules/companies/src/api/domain/telework-authorization.test.ts b/modules/companies/src/api/domain/telework-authorization.test.ts
index 441ca78..0dd9968 100644
--- a/modules/companies/src/api/domain/telework-authorization.test.ts
+++ b/modules/companies/src/api/domain/telework-authorization.test.ts
@@ -9,10 +9,8 @@ import { teleworkAuthorizationState } from "../application/telework-authorizatio
 import { TeleworkAuthorizationPersistenceMapper } from "../infrastructure/persistence/telework-authorization-persistence.mapper";
 
 import { TeleworkAuthorization } from "./telework-authorization.aggregate";
-import {
-  type TeleworkAuthorizationInput,
-  TeleworkAuthorizationInputSchema,
-} from "./telework-authorization-values";
+import type { TeleworkAuthorizationInput } from "./telework-authorization-values";
+import { TeleworkAuthorizationInputSchema } from "./telework-authorization-values";
 import { TeleworkAuthorizationValues } from "./value-objects/telework-authorization-values";
 
 const company = UniqueID.generateNewID();
diff --git a/modules/companies/src/api/domain/ticket-revision.entity.ts b/modules/companies/src/api/domain/ticket-revision.entity.ts
index acba0cb..01acf7a 100644
--- a/modules/companies/src/api/domain/ticket-revision.entity.ts
+++ b/modules/companies/src/api/domain/ticket-revision.entity.ts
@@ -1,4 +1,5 @@
-import { DomainEntity, type UniqueID } from "@repo/rdx-ddd";
+import type { UniqueID } from "@repo/rdx-ddd";
+import { DomainEntity } from "@repo/rdx-ddd";
 
 import type { TicketValues } from "./value-objects/ticket-values";
 export type TicketRevisionProps = Readonly<{
diff --git a/modules/companies/src/api/domain/ticket.aggregate.ts b/modules/companies/src/api/domain/ticket.aggregate.ts
index c3156c9..997fdeb 100644
--- a/modules/companies/src/api/domain/ticket.aggregate.ts
+++ b/modules/companies/src/api/domain/ticket.aggregate.ts
@@ -1,4 +1,5 @@
-import { AggregateRoot, type Name, type UniqueID } from "@repo/rdx-ddd";
+import type { Name, UniqueID } from "@repo/rdx-ddd";
+import { AggregateRoot } from "@repo/rdx-ddd";
 import { Result } from "@repo/rdx-utils";
 import { z } from "zod/v4";
 
diff --git a/modules/companies/src/api/domain/value-objects/application-configuration-values.ts b/modules/companies/src/api/domain/value-objects/application-configuration-values.ts
index b2dde33..f307d31 100644
--- a/modules/companies/src/api/domain/value-objects/application-configuration-values.ts
+++ b/modules/companies/src/api/domain/value-objects/application-configuration-values.ts
@@ -1,9 +1,9 @@
 import { UniqueID } from "@repo/rdx-ddd";
 import { Maybe, Result } from "@repo/rdx-utils";
 
+import type { ApplicationConfigurationInput } from "../application-configuration-values";
 import {
   ApplicationConfigurationError,
-  type ApplicationConfigurationInput,
   ApplicationConfigurationInputSchema,
 } from "../application-configuration-values";
 export class ApplicationConfigurationValues {
diff --git a/modules/companies/src/api/domain/value-objects/certificate-configuration-values.ts b/modules/companies/src/api/domain/value-objects/certificate-configuration-values.ts
index 80c33e3..aba3956 100644
--- a/modules/companies/src/api/domain/value-objects/certificate-configuration-values.ts
+++ b/modules/companies/src/api/domain/value-objects/certificate-configuration-values.ts
@@ -1,9 +1,9 @@
 import { UniqueID } from "@repo/rdx-ddd";
 import { Maybe, Result } from "@repo/rdx-utils";
 
+import type { CertificateConfigurationInput } from "../certificate-configuration-values";
 import {
   CertificateConfigurationError,
-  type CertificateConfigurationInput,
   CertificateConfigurationInputSchema,
 } from "../certificate-configuration-values";
 export class CertificateConfigurationValues {
diff --git a/modules/companies/src/api/domain/value-objects/folder-mapping-values.ts b/modules/companies/src/api/domain/value-objects/folder-mapping-values.ts
index 3092a11..be1dfd0 100644
--- a/modules/companies/src/api/domain/value-objects/folder-mapping-values.ts
+++ b/modules/companies/src/api/domain/value-objects/folder-mapping-values.ts
@@ -1,11 +1,8 @@
 import { UniqueID } from "@repo/rdx-ddd";
 import { Maybe, Result } from "@repo/rdx-utils";
 
-import {
-  FolderMappingError,
-  type FolderMappingInput,
-  FolderMappingInputSchema,
-} from "../folder-mapping-values";
+import type { FolderMappingInput } from "../folder-mapping-values";
+import { FolderMappingError, FolderMappingInputSchema } from "../folder-mapping-values";
 
 import { DriveLetter } from "./drive-letter";
 import { SharedFolderPath } from "./shared-folder-path";
diff --git a/modules/companies/src/api/domain/value-objects/intervention-template-values.ts b/modules/companies/src/api/domain/value-objects/intervention-template-values.ts
index 30d6dfe..f5b0724 100644
--- a/modules/companies/src/api/domain/value-objects/intervention-template-values.ts
+++ b/modules/companies/src/api/domain/value-objects/intervention-template-values.ts
@@ -2,9 +2,9 @@ import { Name } from "@repo/rdx-ddd";
 import { Result } from "@repo/rdx-utils";
 
 import { InterventionTemplateStep } from "../intervention-template-step.entity";
+import type { InterventionTemplateInput } from "../intervention-template-values";
 import {
   InterventionTemplateError,
-  type InterventionTemplateInput,
   InterventionTemplateInputSchema,
 } from "../intervention-template-values";
 
diff --git a/modules/companies/src/api/domain/value-objects/intervention-values.ts b/modules/companies/src/api/domain/value-objects/intervention-values.ts
index e792c0f..d1e2f47 100644
--- a/modules/companies/src/api/domain/value-objects/intervention-values.ts
+++ b/modules/companies/src/api/domain/value-objects/intervention-values.ts
@@ -2,11 +2,8 @@ import { Name, UniqueID } from "@repo/rdx-ddd";
 import { Maybe, Result } from "@repo/rdx-utils";
 
 import { InterventionStep } from "../intervention-step.entity";
-import {
-  InterventionError,
-  type InterventionInput,
-  InterventionInputSchema,
-} from "../intervention-values";
+import type { InterventionInput } from "../intervention-values";
+import { InterventionError, InterventionInputSchema } from "../intervention-values";
 
 import { TicketTarget } from "./ticket-values";
 
diff --git a/modules/companies/src/api/domain/value-objects/mail-configuration-values.ts b/modules/companies/src/api/domain/value-objects/mail-configuration-values.ts
index ccc7418..9f016b5 100644
--- a/modules/companies/src/api/domain/value-objects/mail-configuration-values.ts
+++ b/modules/companies/src/api/domain/value-objects/mail-configuration-values.ts
@@ -1,11 +1,8 @@
 import { EmailAddress, UniqueID } from "@repo/rdx-ddd";
 import { Maybe, Result } from "@repo/rdx-utils";
 
-import {
-  MailConfigurationError,
-  type MailSnapshot,
-  MailSnapshotSchema,
-} from "../mail-configuration-values";
+import type { MailSnapshot } from "../mail-configuration-values";
+import { MailConfigurationError, MailSnapshotSchema } from "../mail-configuration-values";
 
 export class MailConfigurationValues {
   private constructor(
diff --git a/modules/companies/src/api/domain/value-objects/mailbox-use-values.ts b/modules/companies/src/api/domain/value-objects/mailbox-use-values.ts
index 54059e9..fa60888 100644
--- a/modules/companies/src/api/domain/value-objects/mailbox-use-values.ts
+++ b/modules/companies/src/api/domain/value-objects/mailbox-use-values.ts
@@ -1,7 +1,8 @@
 import { UniqueID } from "@repo/rdx-ddd";
 import { Maybe, Result } from "@repo/rdx-utils";
 
-import { MailboxError, type MailboxUseInput, MailboxUseInputSchema } from "../mailbox-values";
+import type { MailboxUseInput } from "../mailbox-values";
+import { MailboxError, MailboxUseInputSchema } from "../mailbox-values";
 
 import { CalendarDate } from "./calendar-date";
 
diff --git a/modules/companies/src/api/domain/value-objects/mailbox-values.ts b/modules/companies/src/api/domain/value-objects/mailbox-values.ts
index a772094..d8845eb 100644
--- a/modules/companies/src/api/domain/value-objects/mailbox-values.ts
+++ b/modules/companies/src/api/domain/value-objects/mailbox-values.ts
@@ -1,7 +1,8 @@
 import { EmailAddress, UniqueID } from "@repo/rdx-ddd";
 import { Maybe, Result } from "@repo/rdx-utils";
 
-import { MailboxError, type MailboxInput, MailboxInputSchema } from "../mailbox-values";
+import type { MailboxInput } from "../mailbox-values";
+import { MailboxError, MailboxInputSchema } from "../mailbox-values";
 
 export class MailboxValues {
   private constructor(
diff --git a/modules/companies/src/api/domain/value-objects/printer-configuration-values.ts b/modules/companies/src/api/domain/value-objects/printer-configuration-values.ts
index be04dd5..380ccf9 100644
--- a/modules/companies/src/api/domain/value-objects/printer-configuration-values.ts
+++ b/modules/companies/src/api/domain/value-objects/printer-configuration-values.ts
@@ -1,9 +1,9 @@
 import { UniqueID } from "@repo/rdx-ddd";
 import { Maybe, Result } from "@repo/rdx-utils";
 
+import type { PrinterConfigurationInput } from "../printer-configuration-values";
 import {
   PrinterConfigurationError,
-  type PrinterConfigurationInput,
   PrinterConfigurationInputSchema,
 } from "../printer-configuration-values";
 export class PrinterConfigurationValues {
diff --git a/modules/companies/src/api/domain/value-objects/process-template-values.ts b/modules/companies/src/api/domain/value-objects/process-template-values.ts
index c64184a..f2acc10 100644
--- a/modules/companies/src/api/domain/value-objects/process-template-values.ts
+++ b/modules/companies/src/api/domain/value-objects/process-template-values.ts
@@ -1,11 +1,8 @@
 import { Name } from "@repo/rdx-ddd";
 import { Maybe, Result } from "@repo/rdx-utils";
 
-import {
-  ProcessError,
-  type ProcessTemplateInput,
-  ProcessTemplateInputSchema,
-} from "../process-values";
+import type { ProcessTemplateInput } from "../process-values";
+import { ProcessError, ProcessTemplateInputSchema } from "../process-values";
 export class ProcessTemplateValues {
   private constructor(
     public readonly name: Name,
diff --git a/modules/companies/src/api/domain/value-objects/process-values.ts b/modules/companies/src/api/domain/value-objects/process-values.ts
index 477f9bf..1dc26b2 100644
--- a/modules/companies/src/api/domain/value-objects/process-values.ts
+++ b/modules/companies/src/api/domain/value-objects/process-values.ts
@@ -2,7 +2,8 @@ import { Name, UniqueID } from "@repo/rdx-ddd";
 import { Maybe, Result } from "@repo/rdx-utils";
 
 import { ProcessTask } from "../process-task.entity";
-import { ProcessError, type ProcessValuesInput, ProcessValuesSchema } from "../process-values";
+import type { ProcessValuesInput } from "../process-values";
+import { ProcessError, ProcessValuesSchema } from "../process-values";
 export class ProcessValues {
   private constructor(
     public readonly personId: UniqueID,
diff --git a/modules/companies/src/api/domain/value-objects/remote-connection-values.ts b/modules/companies/src/api/domain/value-objects/remote-connection-values.ts
index 1a7baa6..587acc2 100644
--- a/modules/companies/src/api/domain/value-objects/remote-connection-values.ts
+++ b/modules/companies/src/api/domain/value-objects/remote-connection-values.ts
@@ -1,11 +1,8 @@
 import { Name, UniqueID } from "@repo/rdx-ddd";
 import { Maybe, Result } from "@repo/rdx-utils";
 
-import {
-  RemoteConnectionError,
-  type RemoteConnectionInput,
-  RemoteConnectionInputSchema,
-} from "../remote-connection-values";
+import type { RemoteConnectionInput } from "../remote-connection-values";
+import { RemoteConnectionError, RemoteConnectionInputSchema } from "../remote-connection-values";
 export class RemoteConnectionValues {
   private constructor(
     public readonly personId: UniqueID,
diff --git a/modules/companies/src/api/domain/value-objects/telework-authorization-values.ts b/modules/companies/src/api/domain/value-objects/telework-authorization-values.ts
index c7af92e..86757a0 100644
--- a/modules/companies/src/api/domain/value-objects/telework-authorization-values.ts
+++ b/modules/companies/src/api/domain/value-objects/telework-authorization-values.ts
@@ -1,9 +1,9 @@
 import { UniqueID } from "@repo/rdx-ddd";
 import { Maybe, Result } from "@repo/rdx-utils";
 
+import type { TeleworkAuthorizationInput } from "../telework-authorization-values";
 import {
   TeleworkAuthorizationError,
-  type TeleworkAuthorizationInput,
   TeleworkAuthorizationInputSchema,
 } from "../telework-authorization-values";
 
diff --git a/modules/companies/src/api/domain/value-objects/ticket-values.ts b/modules/companies/src/api/domain/value-objects/ticket-values.ts
index 1312583..4c1592a 100644
--- a/modules/companies/src/api/domain/value-objects/ticket-values.ts
+++ b/modules/companies/src/api/domain/value-objects/ticket-values.ts
@@ -1,12 +1,8 @@
 import { Name, UniqueID } from "@repo/rdx-ddd";
 import { Maybe, Result } from "@repo/rdx-utils";
 
-import {
-  TicketError,
-  type TicketInput,
-  TicketInputSchema,
-  type TicketTargetInput,
-} from "../ticket-values";
+import type { TicketInput, TicketTargetInput } from "../ticket-values";
+import { TicketError, TicketInputSchema } from "../ticket-values";
 export class TicketTarget {
   private constructor(
     public readonly kind: TicketTargetInput["kind"],
diff --git a/modules/companies/src/api/domain/value-objects/work-profile-values.ts b/modules/companies/src/api/domain/value-objects/work-profile-values.ts
index b401509..d032b99 100644
--- a/modules/companies/src/api/domain/value-objects/work-profile-values.ts
+++ b/modules/companies/src/api/domain/value-objects/work-profile-values.ts
@@ -1,11 +1,8 @@
 import { Name, UniqueID } from "@repo/rdx-ddd";
 import { Maybe, Result } from "@repo/rdx-utils";
 
-import {
-  WorkProfileError,
-  type WorkProfileInput,
-  WorkProfileInputSchema,
-} from "../work-profile-values";
+import type { WorkProfileInput } from "../work-profile-values";
+import { WorkProfileError, WorkProfileInputSchema } from "../work-profile-values";
 
 export class WorkProfileValues {
   private constructor(
diff --git a/modules/companies/src/api/domain/work-profile-revision.entity.ts b/modules/companies/src/api/domain/work-profile-revision.entity.ts
index 4b9de02..4bba545 100644
--- a/modules/companies/src/api/domain/work-profile-revision.entity.ts
+++ b/modules/companies/src/api/domain/work-profile-revision.entity.ts
@@ -1,4 +1,5 @@
-import { DomainEntity, type UniqueID } from "@repo/rdx-ddd";
+import type { UniqueID } from "@repo/rdx-ddd";
+import { DomainEntity } from "@repo/rdx-ddd";
 
 import type { WorkProfileValues } from "./value-objects/work-profile-values";
 export type WorkProfileRevisionProps = Readonly<{
diff --git a/modules/companies/src/api/domain/work-profile.aggregate.ts b/modules/companies/src/api/domain/work-profile.aggregate.ts
index b232ff3..3970557 100644
--- a/modules/companies/src/api/domain/work-profile.aggregate.ts
+++ b/modules/companies/src/api/domain/work-profile.aggregate.ts
@@ -1,4 +1,5 @@
-import { AggregateRoot, type UniqueID } from "@repo/rdx-ddd";
+import type { UniqueID } from "@repo/rdx-ddd";
+import { AggregateRoot } from "@repo/rdx-ddd";
 import { Result } from "@repo/rdx-utils";
 import { z } from "zod/v4";
 
diff --git a/modules/companies/src/api/infrastructure/http/application-configuration.routes.ts b/modules/companies/src/api/infrastructure/http/application-configuration.routes.ts
index de2bdf5..219e173 100644
--- a/modules/companies/src/api/infrastructure/http/application-configuration.routes.ts
+++ b/modules/companies/src/api/infrastructure/http/application-configuration.routes.ts
@@ -1,4 +1,5 @@
-import { type Application, type RequestHandler, type Response, Router } from "express";
+import type { Application, RequestHandler, Response } from "express";
+import { Router } from "express";
 import { z } from "zod/v4";
 
 import {
diff --git a/modules/companies/src/api/infrastructure/http/certificate-configuration.routes.ts b/modules/companies/src/api/infrastructure/http/certificate-configuration.routes.ts
index f46c12d..55e6c16 100644
--- a/modules/companies/src/api/infrastructure/http/certificate-configuration.routes.ts
+++ b/modules/companies/src/api/infrastructure/http/certificate-configuration.routes.ts
@@ -1,4 +1,5 @@
-import { type Application, type RequestHandler, type Response, Router } from "express";
+import type { Application, RequestHandler, Response } from "express";
+import { Router } from "express";
 import { z } from "zod/v4";
 
 import {
diff --git a/modules/companies/src/api/infrastructure/http/folder-mapping.routes.ts b/modules/companies/src/api/infrastructure/http/folder-mapping.routes.ts
index 65c1a34..a71dfab 100644
--- a/modules/companies/src/api/infrastructure/http/folder-mapping.routes.ts
+++ b/modules/companies/src/api/infrastructure/http/folder-mapping.routes.ts
@@ -1,4 +1,5 @@
-import { type Application, type RequestHandler, type Response, Router } from "express";
+import type { Application, RequestHandler, Response } from "express";
+import { Router } from "express";
 import { z } from "zod/v4";
 
 import { SaveFolderMappingRequestSchema } from "../../../common/folder-mappings";
diff --git a/modules/companies/src/api/infrastructure/http/mail-configuration.routes.ts b/modules/companies/src/api/infrastructure/http/mail-configuration.routes.ts
index e5920df..e722612 100644
--- a/modules/companies/src/api/infrastructure/http/mail-configuration.routes.ts
+++ b/modules/companies/src/api/infrastructure/http/mail-configuration.routes.ts
@@ -1,4 +1,5 @@
-import { type Application, type RequestHandler, type Response, Router } from "express";
+import type { Application, RequestHandler, Response } from "express";
+import { Router } from "express";
 import { z } from "zod/v4";
 
 import {
diff --git a/modules/companies/src/api/infrastructure/http/mailbox.routes.ts b/modules/companies/src/api/infrastructure/http/mailbox.routes.ts
index 7f6de30..300c86f 100644
--- a/modules/companies/src/api/infrastructure/http/mailbox.routes.ts
+++ b/modules/companies/src/api/infrastructure/http/mailbox.routes.ts
@@ -1,4 +1,5 @@
-import { type Application, type RequestHandler, type Response, Router } from "express";
+import type { Application, RequestHandler, Response } from "express";
+import { Router } from "express";
 import { z } from "zod/v4";
 
 import { MailItemParamsSchema, MailParamsSchema } from "../../../common/mail-configurations";
diff --git a/modules/companies/src/api/infrastructure/http/printer-configuration.routes.ts b/modules/companies/src/api/infrastructure/http/printer-configuration.routes.ts
index f5500f5..87674b6 100644
--- a/modules/companies/src/api/infrastructure/http/printer-configuration.routes.ts
+++ b/modules/companies/src/api/infrastructure/http/printer-configuration.routes.ts
@@ -1,4 +1,5 @@
-import { type Application, type RequestHandler, type Response, Router } from "express";
+import type { Application, RequestHandler, Response } from "express";
+import { Router } from "express";
 import { z } from "zod/v4";
 
 import {
diff --git a/modules/companies/src/api/infrastructure/http/process.routes.ts b/modules/companies/src/api/infrastructure/http/process.routes.ts
index dcdfdb4..b0ce0c5 100644
--- a/modules/companies/src/api/infrastructure/http/process.routes.ts
+++ b/modules/companies/src/api/infrastructure/http/process.routes.ts
@@ -1,4 +1,5 @@
-import { type Application, type RequestHandler, type Response, Router } from "express";
+import type { Application, RequestHandler, Response } from "express";
+import { Router } from "express";
 import { z } from "zod/v4";
 
 import {
diff --git a/modules/companies/src/api/infrastructure/http/remote-connection.routes.ts b/modules/companies/src/api/infrastructure/http/remote-connection.routes.ts
index 62d8979..5d1edb5 100644
--- a/modules/companies/src/api/infrastructure/http/remote-connection.routes.ts
+++ b/modules/companies/src/api/infrastructure/http/remote-connection.routes.ts
@@ -1,4 +1,5 @@
-import { type Application, type RequestHandler, type Response, Router } from "express";
+import type { Application, RequestHandler, Response } from "express";
+import { Router } from "express";
 import { z } from "zod/v4";
 
 import {
diff --git a/modules/companies/src/api/infrastructure/http/telework-authorization.routes.ts b/modules/companies/src/api/infrastructure/http/telework-authorization.routes.ts
index e02d47e..cd1bebb 100644
--- a/modules/companies/src/api/infrastructure/http/telework-authorization.routes.ts
+++ b/modules/companies/src/api/infrastructure/http/telework-authorization.routes.ts
@@ -1,4 +1,5 @@
-import { type Application, type RequestHandler, type Response, Router } from "express";
+import type { Application, RequestHandler, Response } from "express";
+import { Router } from "express";
 import { z } from "zod/v4";
 
 import {
diff --git a/modules/companies/src/api/infrastructure/http/work-profile.routes.ts b/modules/companies/src/api/infrastructure/http/work-profile.routes.ts
index d826170..e9d591a 100644
--- a/modules/companies/src/api/infrastructure/http/work-profile.routes.ts
+++ b/modules/companies/src/api/infrastructure/http/work-profile.routes.ts
@@ -1,4 +1,5 @@
-import { type Application, type RequestHandler, type Response, Router } from "express";
+import type { Application, RequestHandler, Response } from "express";
+import { Router } from "express";
 import { z } from "zod/v4";
 
 import {
diff --git a/modules/companies/src/api/infrastructure/persistence/application-configuration-migration.ts b/modules/companies/src/api/infrastructure/persistence/application-configuration-migration.ts
index 39cb6e0..84465cc 100644
--- a/modules/companies/src/api/infrastructure/persistence/application-configuration-migration.ts
+++ b/modules/companies/src/api/infrastructure/persistence/application-configuration-migration.ts
@@ -1,4 +1,5 @@
-import { DataTypes, QueryTypes, type Sequelize } from "sequelize";
+import type { Sequelize } from "sequelize";
+import { DataTypes, QueryTypes } from "sequelize";
 export async function migrateApplicationConfigurations(database: Sequelize) {
   const q = database.getQueryInterface();
   const tables = await database.query<{ name: string }>(
diff --git a/modules/companies/src/api/infrastructure/persistence/certificate-configuration-migration.ts b/modules/companies/src/api/infrastructure/persistence/certificate-configuration-migration.ts
index b56d710..8c16ba0 100644
--- a/modules/companies/src/api/infrastructure/persistence/certificate-configuration-migration.ts
+++ b/modules/companies/src/api/infrastructure/persistence/certificate-configuration-migration.ts
@@ -1,4 +1,5 @@
-import { DataTypes, QueryTypes, type Sequelize } from "sequelize";
+import type { Sequelize } from "sequelize";
+import { DataTypes, QueryTypes } from "sequelize";
 export async function migrateCertificateConfigurations(database: Sequelize) {
   const q = database.getQueryInterface();
   const tables = await database.query<{ name: string }>(
diff --git a/modules/companies/src/api/infrastructure/persistence/folder-mapping-migration.ts b/modules/companies/src/api/infrastructure/persistence/folder-mapping-migration.ts
index dd9e038..5c5bdbc 100644
--- a/modules/companies/src/api/infrastructure/persistence/folder-mapping-migration.ts
+++ b/modules/companies/src/api/infrastructure/persistence/folder-mapping-migration.ts
@@ -1,4 +1,5 @@
-import { DataTypes, QueryTypes, type Sequelize } from "sequelize";
+import type { Sequelize } from "sequelize";
+import { DataTypes, QueryTypes } from "sequelize";
 export async function migrateFolderMappings(database: Sequelize) {
   const q = database.getQueryInterface();
   const tables = await database.query<{ name: string }>(
diff --git a/modules/companies/src/api/infrastructure/persistence/intervention-migration.ts b/modules/companies/src/api/infrastructure/persistence/intervention-migration.ts
index 9643d56..5a8f036 100644
--- a/modules/companies/src/api/infrastructure/persistence/intervention-migration.ts
+++ b/modules/companies/src/api/infrastructure/persistence/intervention-migration.ts
@@ -1,4 +1,5 @@
-import { DataTypes, QueryTypes, type Sequelize } from "sequelize";
+import type { Sequelize } from "sequelize";
+import { DataTypes, QueryTypes } from "sequelize";
 export async function migrateInterventions(database: Sequelize) {
   const query = database.getQueryInterface();
   const tables = await database.query<{ name: string }>(
diff --git a/modules/companies/src/api/infrastructure/persistence/intervention-template-migration.ts b/modules/companies/src/api/infrastructure/persistence/intervention-template-migration.ts
index 92b2a0a..3340b6a 100644
--- a/modules/companies/src/api/infrastructure/persistence/intervention-template-migration.ts
+++ b/modules/companies/src/api/infrastructure/persistence/intervention-template-migration.ts
@@ -1,4 +1,5 @@
-import { DataTypes, QueryTypes, type Sequelize } from "sequelize";
+import type { Sequelize } from "sequelize";
+import { DataTypes, QueryTypes } from "sequelize";
 
 import { interventionTemplateSeeds } from "../../domain/intervention-template-seed";
 
diff --git a/modules/companies/src/api/infrastructure/persistence/mail-configuration-migration.ts b/modules/companies/src/api/infrastructure/persistence/mail-configuration-migration.ts
index 328472b..aa2ab65 100644
--- a/modules/companies/src/api/infrastructure/persistence/mail-configuration-migration.ts
+++ b/modules/companies/src/api/infrastructure/persistence/mail-configuration-migration.ts
@@ -1,4 +1,5 @@
-import { DataTypes, QueryTypes, type Sequelize } from "sequelize";
+import type { Sequelize } from "sequelize";
+import { DataTypes, QueryTypes } from "sequelize";
 export async function migrateMailConfigurations(database: Sequelize) {
   const query = database.getQueryInterface();
   const rows = await database.query<{ name: string }>(
diff --git a/modules/companies/src/api/infrastructure/persistence/mailbox-migration.ts b/modules/companies/src/api/infrastructure/persistence/mailbox-migration.ts
index e0db75a..0fd965a 100644
--- a/modules/companies/src/api/infrastructure/persistence/mailbox-migration.ts
+++ b/modules/companies/src/api/infrastructure/persistence/mailbox-migration.ts
@@ -1,4 +1,5 @@
-import { DataTypes, QueryTypes, type Sequelize } from "sequelize";
+import type { Sequelize } from "sequelize";
+import { DataTypes, QueryTypes } from "sequelize";
 export async function migrateMailboxes(database: Sequelize) {
   const query = database.getQueryInterface();
   const tables = await database.query<{ name: string }>(
diff --git a/modules/companies/src/api/infrastructure/persistence/printer-configuration-migration.ts b/modules/companies/src/api/infrastructure/persistence/printer-configuration-migration.ts
index 0933541..cdc40a3 100644
--- a/modules/companies/src/api/infrastructure/persistence/printer-configuration-migration.ts
+++ b/modules/companies/src/api/infrastructure/persistence/printer-configuration-migration.ts
@@ -1,4 +1,5 @@
-import { DataTypes, QueryTypes, type Sequelize } from "sequelize";
+import type { Sequelize } from "sequelize";
+import { DataTypes, QueryTypes } from "sequelize";
 export async function migratePrinterConfigurations(database: Sequelize) {
   const q = database.getQueryInterface();
   const tables = await database.query<{ name: string }>(
diff --git a/modules/companies/src/api/infrastructure/persistence/process-migration.ts b/modules/companies/src/api/infrastructure/persistence/process-migration.ts
index c6ccdbb..bc001a5 100644
--- a/modules/companies/src/api/infrastructure/persistence/process-migration.ts
+++ b/modules/companies/src/api/infrastructure/persistence/process-migration.ts
@@ -1,5 +1,6 @@
 import { Maybe } from "@repo/rdx-utils";
-import { DataTypes, QueryTypes, type Sequelize, type Transaction } from "sequelize";
+import type { Sequelize, Transaction } from "sequelize";
+import { DataTypes, QueryTypes } from "sequelize";
 
 import { ProcessTemplate } from "../../domain/process-template.aggregate";
 import { ProcessTemplateValues } from "../../domain/value-objects/process-template-values";
diff --git a/modules/companies/src/api/infrastructure/persistence/process-review-reader.ts b/modules/companies/src/api/infrastructure/persistence/process-review-reader.ts
index fbcf793..e6e1b74 100644
--- a/modules/companies/src/api/infrastructure/persistence/process-review-reader.ts
+++ b/modules/companies/src/api/infrastructure/persistence/process-review-reader.ts
@@ -1,11 +1,10 @@
 import type { UniqueID } from "@repo/rdx-ddd";
-import { QueryTypes, type Sequelize, type Transaction } from "sequelize";
+import type { Sequelize, Transaction } from "sequelize";
+import { QueryTypes } from "sequelize";
 
 import type { IProcessAssetInventoryService } from "../../application/process.repository";
-import {
-  type ProcessReviewSources,
-  buildProcessReview,
-} from "../../application/process-review.builder";
+import type { ProcessReviewSources } from "../../application/process-review.builder";
+import { buildProcessReview } from "../../application/process-review.builder";
 import { accessReviewRelationships } from "../../application/process-review-access";
 import { AccessDefinitionSchema } from "../../domain/access/access-definition";
 import { ApplicationConfigurationInputSchema } from "../../domain/application-configuration-values";
diff --git a/modules/companies/src/api/infrastructure/persistence/remote-connection-migration.ts b/modules/companies/src/api/infrastructure/persistence/remote-connection-migration.ts
index 836976d..67bd2c8 100644
--- a/modules/companies/src/api/infrastructure/persistence/remote-connection-migration.ts
+++ b/modules/companies/src/api/infrastructure/persistence/remote-connection-migration.ts
@@ -1,4 +1,5 @@
-import { DataTypes, QueryTypes, type Sequelize } from "sequelize";
+import type { Sequelize } from "sequelize";
+import { DataTypes, QueryTypes } from "sequelize";
 export async function migrateRemoteConnections(database: Sequelize) {
   const query = database.getQueryInterface();
   const tables = await database.query<{ name: string }>(
diff --git a/modules/companies/src/api/infrastructure/persistence/sequelize-application-configuration.repository.ts b/modules/companies/src/api/infrastructure/persistence/sequelize-application-configuration.repository.ts
index 456b7ae..b76fd84 100644
--- a/modules/companies/src/api/infrastructure/persistence/sequelize-application-configuration.repository.ts
+++ b/modules/companies/src/api/infrastructure/persistence/sequelize-application-configuration.repository.ts
@@ -1,7 +1,8 @@
 import type { IResourceInventoryService } from "@metis/resources/services";
 import type { UniqueID } from "@repo/rdx-ddd";
 import { Result } from "@repo/rdx-utils";
-import { QueryTypes, type Sequelize, type Transaction } from "sequelize";
+import type { Sequelize, Transaction } from "sequelize";
+import { QueryTypes } from "sequelize";
 
 import type {
   ApplicationContext,
@@ -11,17 +12,13 @@ import { applicationReferences } from "../../application/application-configurati
 import type { IWorkProfileInventoryService } from "../../application/work-profile.repository";
 import { ApplicationConfigurationError } from "../../domain/application-configuration-values";
 
-import {
-  ApplicationConfigurationPersistenceMapper,
-  type ApplicationRevisionRow,
-  type ApplicationRow,
+import type {
+  ApplicationRevisionRow,
+  ApplicationRow,
 } from "./application-configuration-persistence.mapper";
-import {
-  type ProfileRevisionRow,
-  type ProfileRow,
-  WorkProfilePersistenceMapper,
-  profileIdentity,
-} from "./work-profile-persistence.mapper";
+import { ApplicationConfigurationPersistenceMapper } from "./application-configuration-persistence.mapper";
+import type { ProfileRevisionRow, ProfileRow } from "./work-profile-persistence.mapper";
+import { WorkProfilePersistenceMapper, profileIdentity } from "./work-profile-persistence.mapper";
 export class SequelizeApplicationConfigurationRepository
   implements IApplicationConfigurationRepository
 {
diff --git a/modules/companies/src/api/infrastructure/persistence/sequelize-certificate-configuration.repository.ts b/modules/companies/src/api/infrastructure/persistence/sequelize-certificate-configuration.repository.ts
index d9a3baa..3429c41 100644
--- a/modules/companies/src/api/infrastructure/persistence/sequelize-certificate-configuration.repository.ts
+++ b/modules/companies/src/api/infrastructure/persistence/sequelize-certificate-configuration.repository.ts
@@ -1,7 +1,8 @@
 import type { IResourceInventoryService } from "@metis/resources/services";
 import type { UniqueID } from "@repo/rdx-ddd";
 import { Result } from "@repo/rdx-utils";
-import { QueryTypes, type Sequelize, type Transaction } from "sequelize";
+import type { Sequelize, Transaction } from "sequelize";
+import { QueryTypes } from "sequelize";
 
 import type {
   CertificateContext,
@@ -11,17 +12,13 @@ import { certificateReferences } from "../../application/certificate-configurati
 import type { IWorkProfileInventoryService } from "../../application/work-profile.repository";
 import { CertificateConfigurationError } from "../../domain/certificate-configuration-values";
 
-import {
-  CertificateConfigurationPersistenceMapper,
-  type CertificateRevisionRow,
-  type CertificateRow,
+import type {
+  CertificateRevisionRow,
+  CertificateRow,
 } from "./certificate-configuration-persistence.mapper";
-import {
-  type ProfileRevisionRow,
-  type ProfileRow,
-  WorkProfilePersistenceMapper,
-  profileIdentity,
-} from "./work-profile-persistence.mapper";
+import { CertificateConfigurationPersistenceMapper } from "./certificate-configuration-persistence.mapper";
+import type { ProfileRevisionRow, ProfileRow } from "./work-profile-persistence.mapper";
+import { WorkProfilePersistenceMapper, profileIdentity } from "./work-profile-persistence.mapper";
 export class SequelizeCertificateConfigurationRepository
   implements ICertificateConfigurationRepository
 {
diff --git a/modules/companies/src/api/infrastructure/persistence/sequelize-dashboard.repository.ts b/modules/companies/src/api/infrastructure/persistence/sequelize-dashboard.repository.ts
index a1f04a1..aded47e 100644
--- a/modules/companies/src/api/infrastructure/persistence/sequelize-dashboard.repository.ts
+++ b/modules/companies/src/api/infrastructure/persistence/sequelize-dashboard.repository.ts
@@ -1,4 +1,5 @@
-import { QueryTypes, type Sequelize } from "sequelize";
+import type { Sequelize } from "sequelize";
+import { QueryTypes } from "sequelize";
 
 import type { DashboardDetailsQuery, DashboardEntryDTO } from "../../../common/dashboard";
 import type {
diff --git a/modules/companies/src/api/infrastructure/persistence/sequelize-folder-mapping.repository.ts b/modules/companies/src/api/infrastructure/persistence/sequelize-folder-mapping.repository.ts
index 4f53af4..30118b4 100644
--- a/modules/companies/src/api/infrastructure/persistence/sequelize-folder-mapping.repository.ts
+++ b/modules/companies/src/api/infrastructure/persistence/sequelize-folder-mapping.repository.ts
@@ -1,6 +1,7 @@
 import type { UniqueID } from "@repo/rdx-ddd";
 import { Result } from "@repo/rdx-utils";
-import { QueryTypes, type Sequelize, type Transaction } from "sequelize";
+import type { Sequelize, Transaction } from "sequelize";
+import { QueryTypes } from "sequelize";
 
 import type {
   FolderContext,
@@ -12,14 +13,10 @@ import { AccessDefinitionSchema } from "../../domain/access/access-definition";
 import { AccessValues } from "../../domain/access/access-values";
 import { FolderMappingError } from "../../domain/folder-mapping-values";
 
+import type { FolderRevisionRow, FolderRow } from "./folder-mapping-persistence.mapper";
+import { FolderMappingPersistenceMapper } from "./folder-mapping-persistence.mapper";
+import type { ProfileRevisionRow, ProfileRow } from "./work-profile-persistence.mapper";
 import {
-  FolderMappingPersistenceMapper,
-  type FolderRevisionRow,
-  type FolderRow,
-} from "./folder-mapping-persistence.mapper";
-import {
-  type ProfileRevisionRow,
-  type ProfileRow,
   WorkProfilePersistenceMapper,
   persistedJson,
   profileIdentity,
diff --git a/modules/companies/src/api/infrastructure/persistence/sequelize-intervention-template.repository.ts b/modules/companies/src/api/infrastructure/persistence/sequelize-intervention-template.repository.ts
index 42abb62..f2e8f91 100644
--- a/modules/companies/src/api/infrastructure/persistence/sequelize-intervention-template.repository.ts
+++ b/modules/companies/src/api/infrastructure/persistence/sequelize-intervention-template.repository.ts
@@ -1,6 +1,7 @@
 import type { UniqueID } from "@repo/rdx-ddd";
 import { Result } from "@repo/rdx-utils";
-import { QueryTypes, type Sequelize, type Transaction } from "sequelize";
+import type { Sequelize, Transaction } from "sequelize";
+import { QueryTypes } from "sequelize";
 
 import type { IInterventionTemplateRepository } from "../../application/intervention-template.repository";
 import type { InterventionTemplate } from "../../domain/intervention-template.aggregate";
diff --git a/modules/companies/src/api/infrastructure/persistence/sequelize-intervention.repository.ts b/modules/companies/src/api/infrastructure/persistence/sequelize-intervention.repository.ts
index cab0b78..de3c44f 100644
--- a/modules/companies/src/api/infrastructure/persistence/sequelize-intervention.repository.ts
+++ b/modules/companies/src/api/infrastructure/persistence/sequelize-intervention.repository.ts
@@ -1,6 +1,7 @@
 import type { UniqueID } from "@repo/rdx-ddd";
 import { Result } from "@repo/rdx-utils";
-import { QueryTypes, type Sequelize, type Transaction } from "sequelize";
+import type { Sequelize, Transaction } from "sequelize";
+import { QueryTypes } from "sequelize";
 import { z } from "zod/v4";
 
 import type {
diff --git a/modules/companies/src/api/infrastructure/persistence/sequelize-mail-configuration.repository.ts b/modules/companies/src/api/infrastructure/persistence/sequelize-mail-configuration.repository.ts
index 21852b5..f213a01 100644
--- a/modules/companies/src/api/infrastructure/persistence/sequelize-mail-configuration.repository.ts
+++ b/modules/companies/src/api/infrastructure/persistence/sequelize-mail-configuration.repository.ts
@@ -1,6 +1,7 @@
 import type { UniqueID } from "@repo/rdx-ddd";
 import { Result } from "@repo/rdx-utils";
-import { QueryTypes, type Sequelize, type Transaction } from "sequelize";
+import type { Sequelize, Transaction } from "sequelize";
+import { QueryTypes } from "sequelize";
 
 import type {
   IMailConfigurationRepository,
@@ -11,18 +12,14 @@ import type { MailboxContext } from "../../application/mailbox.repository";
 import { MailConfigurationError } from "../../domain/mail-configuration-values";
 import type { MailConfigurationValues } from "../../domain/value-objects/mail-configuration-values";
 
+import type { MailRevisionRow, MailRow } from "./mail-configuration-persistence.mapper";
 import {
   MailConfigurationPersistenceMapper,
-  type MailRevisionRow,
-  type MailRow,
   mailIdentity,
 } from "./mail-configuration-persistence.mapper";
 import type { SequelizeMailboxRepository } from "./sequelize-mailbox.repository";
-import {
-  type ProfileRevisionRow,
-  type ProfileRow,
-  WorkProfilePersistenceMapper,
-} from "./work-profile-persistence.mapper";
+import type { ProfileRevisionRow, ProfileRow } from "./work-profile-persistence.mapper";
+import { WorkProfilePersistenceMapper } from "./work-profile-persistence.mapper";
 
 function validateLink(
   values: MailConfigurationValues,
diff --git a/modules/companies/src/api/infrastructure/persistence/sequelize-mailbox.repository.ts b/modules/companies/src/api/infrastructure/persistence/sequelize-mailbox.repository.ts
index ea8013b..9834661 100644
--- a/modules/companies/src/api/infrastructure/persistence/sequelize-mailbox.repository.ts
+++ b/modules/companies/src/api/infrastructure/persistence/sequelize-mailbox.repository.ts
@@ -1,6 +1,7 @@
 import type { UniqueID } from "@repo/rdx-ddd";
 import { Result } from "@repo/rdx-utils";
-import { QueryTypes, type Sequelize, type Transaction } from "sequelize";
+import type { Sequelize, Transaction } from "sequelize";
+import { QueryTypes } from "sequelize";
 
 import type { IMailboxRepository, MailboxContext } from "../../application/mailbox.repository";
 import { AccessDefinitionSchema } from "../../domain/access/access-definition";
@@ -8,13 +9,8 @@ import { Mailbox } from "../../domain/mailbox.aggregate";
 import type { MailboxUse } from "../../domain/mailbox-use.aggregate";
 import { MailboxError } from "../../domain/mailbox-values";
 
-import {
-  MailboxPersistenceMapper,
-  type MailboxRevisionRow,
-  type MailboxRow,
-  type MailboxUseRow,
-  mailboxIdentity,
-} from "./mailbox-persistence.mapper";
+import type { MailboxRevisionRow, MailboxRow, MailboxUseRow } from "./mailbox-persistence.mapper";
+import { MailboxPersistenceMapper, mailboxIdentity } from "./mailbox-persistence.mapper";
 
 export class SequelizeMailboxRepository implements IMailboxRepository {
   private readonly mapper = new MailboxPersistenceMapper();
diff --git a/modules/companies/src/api/infrastructure/persistence/sequelize-printer-configuration.repository.ts b/modules/companies/src/api/infrastructure/persistence/sequelize-printer-configuration.repository.ts
index 18296d5..d55bc3a 100644
--- a/modules/companies/src/api/infrastructure/persistence/sequelize-printer-configuration.repository.ts
+++ b/modules/companies/src/api/infrastructure/persistence/sequelize-printer-configuration.repository.ts
@@ -1,6 +1,7 @@
 import type { UniqueID } from "@repo/rdx-ddd";
 import { Result } from "@repo/rdx-utils";
-import { QueryTypes, type Sequelize, type Transaction } from "sequelize";
+import type { Sequelize, Transaction } from "sequelize";
+import { QueryTypes } from "sequelize";
 
 import type {
   IPrinterConfigurationRepository,
@@ -10,17 +11,10 @@ import { printerReferences } from "../../application/printer-configuration-polic
 import type { IWorkProfileInventoryService } from "../../application/work-profile.repository";
 import { PrinterConfigurationError } from "../../domain/printer-configuration-values";
 
-import {
-  PrinterConfigurationPersistenceMapper,
-  type PrinterRevisionRow,
-  type PrinterRow,
-} from "./printer-configuration-persistence.mapper";
-import {
-  type ProfileRevisionRow,
-  type ProfileRow,
-  WorkProfilePersistenceMapper,
-  profileIdentity,
-} from "./work-profile-persistence.mapper";
+import type { PrinterRevisionRow, PrinterRow } from "./printer-configuration-persistence.mapper";
+import { PrinterConfigurationPersistenceMapper } from "./printer-configuration-persistence.mapper";
+import type { ProfileRevisionRow, ProfileRow } from "./work-profile-persistence.mapper";
+import { WorkProfilePersistenceMapper, profileIdentity } from "./work-profile-persistence.mapper";
 export class SequelizePrinterConfigurationRepository implements IPrinterConfigurationRepository {
   private readonly mapper = new PrinterConfigurationPersistenceMapper();
   constructor(
diff --git a/modules/companies/src/api/infrastructure/persistence/sequelize-process.repository.ts b/modules/companies/src/api/infrastructure/persistence/sequelize-process.repository.ts
index 2633d85..cbd1b5c 100644
--- a/modules/companies/src/api/infrastructure/persistence/sequelize-process.repository.ts
+++ b/modules/companies/src/api/infrastructure/persistence/sequelize-process.repository.ts
@@ -1,7 +1,8 @@
 import type { IResourceInventoryService } from "@metis/resources/services";
 import { UniqueID } from "@repo/rdx-ddd";
 import { Result } from "@repo/rdx-utils";
-import { QueryTypes, type Sequelize, type Transaction } from "sequelize";
+import type { Sequelize, Transaction } from "sequelize";
+import { QueryTypes } from "sequelize";
 
 import type {
   IProcessAssetInventoryService,
@@ -11,17 +12,14 @@ import type {
 } from "../../application/process.repository";
 import { ProcessError } from "../../domain/process-values";
 
-import {
-  PersonProcessPersistenceMapper,
-  type PersonProcessRevisionRow,
-  type PersonProcessRow,
-} from "./process-persistence.mapper";
+import type { PersonProcessRevisionRow, PersonProcessRow } from "./process-persistence.mapper";
+import { PersonProcessPersistenceMapper } from "./process-persistence.mapper";
 import { ProcessReviewReader } from "./process-review-reader";
-import {
-  ProcessTemplatePersistenceMapper,
-  type ProcessTemplateRevisionRow,
-  type ProcessTemplateRow,
+import type {
+  ProcessTemplateRevisionRow,
+  ProcessTemplateRow,
 } from "./process-template-persistence.mapper";
+import { ProcessTemplatePersistenceMapper } from "./process-template-persistence.mapper";
 export class SequelizeProcessRepository implements IProcessRepository {
   private readonly processMapper = new PersonProcessPersistenceMapper();
   private readonly templateMapper = new ProcessTemplatePersistenceMapper();
diff --git a/modules/companies/src/api/infrastructure/persistence/sequelize-remote-connection.repository.ts b/modules/companies/src/api/infrastructure/persistence/sequelize-remote-connection.repository.ts
index ce8d967..935df8a 100644
--- a/modules/companies/src/api/infrastructure/persistence/sequelize-remote-connection.repository.ts
+++ b/modules/companies/src/api/infrastructure/persistence/sequelize-remote-connection.repository.ts
@@ -1,7 +1,8 @@
 import type { IResourceInventoryService } from "@metis/resources/services";
 import type { UniqueID } from "@repo/rdx-ddd";
 import { Result } from "@repo/rdx-utils";
-import { QueryTypes, type Sequelize, type Transaction } from "sequelize";
+import type { Sequelize, Transaction } from "sequelize";
+import { QueryTypes } from "sequelize";
 
 import type {
   IRemoteConnectionRepository,
@@ -11,15 +12,11 @@ import { remoteReferences } from "../../application/remote-connection-policy";
 import type { IWorkProfileInventoryService } from "../../application/work-profile.repository";
 import { RemoteConnectionError } from "../../domain/remote-connection-values";
 
-import {
-  RemoteConnectionPersistenceMapper,
-  type RemoteRevisionRow,
-  type RemoteRow,
-} from "./remote-connection-persistence.mapper";
+import type { RemoteRevisionRow, RemoteRow } from "./remote-connection-persistence.mapper";
+import { RemoteConnectionPersistenceMapper } from "./remote-connection-persistence.mapper";
+import type { TeleworkRevisionRow, TeleworkRow } from "./telework-authorization-persistence.mapper";
 import {
   TeleworkAuthorizationPersistenceMapper,
-  type TeleworkRevisionRow,
-  type TeleworkRow,
   teleworkIdentity,
 } from "./telework-authorization-persistence.mapper";
 
diff --git a/modules/companies/src/api/infrastructure/persistence/sequelize-telework-authorization.repository.ts b/modules/companies/src/api/infrastructure/persistence/sequelize-telework-authorization.repository.ts
index 699d81a..757bbba 100644
--- a/modules/companies/src/api/infrastructure/persistence/sequelize-telework-authorization.repository.ts
+++ b/modules/companies/src/api/infrastructure/persistence/sequelize-telework-authorization.repository.ts
@@ -1,6 +1,7 @@
 import type { UniqueID } from "@repo/rdx-ddd";
 import { Result } from "@repo/rdx-utils";
-import { QueryTypes, type Sequelize, type Transaction } from "sequelize";
+import type { Sequelize, Transaction } from "sequelize";
+import { QueryTypes } from "sequelize";
 
 import type {
   ITeleworkAuthorizationRepository,
@@ -8,10 +9,9 @@ import type {
 } from "../../application/telework-authorization.repository";
 import { TeleworkAuthorizationError } from "../../domain/telework-authorization-values";
 
+import type { TeleworkRevisionRow, TeleworkRow } from "./telework-authorization-persistence.mapper";
 import {
   TeleworkAuthorizationPersistenceMapper,
-  type TeleworkRevisionRow,
-  type TeleworkRow,
   teleworkIdentity,
 } from "./telework-authorization-persistence.mapper";
 
diff --git a/modules/companies/src/api/infrastructure/persistence/sequelize-ticket.repository.ts b/modules/companies/src/api/infrastructure/persistence/sequelize-ticket.repository.ts
index 4da77c3..6eaabd4 100644
--- a/modules/companies/src/api/infrastructure/persistence/sequelize-ticket.repository.ts
+++ b/modules/companies/src/api/infrastructure/persistence/sequelize-ticket.repository.ts
@@ -1,7 +1,8 @@
 import type { IResourceInventoryService } from "@metis/resources/services";
 import type { UniqueID } from "@repo/rdx-ddd";
 import { Result } from "@repo/rdx-utils";
-import { QueryTypes, type Sequelize, type Transaction } from "sequelize";
+import type { Sequelize, Transaction } from "sequelize";
+import { QueryTypes } from "sequelize";
 import { z } from "zod/v4";
 
 import type {
diff --git a/modules/companies/src/api/infrastructure/persistence/sequelize-work-profile.repository.ts b/modules/companies/src/api/infrastructure/persistence/sequelize-work-profile.repository.ts
index cc062f3..530e437 100644
--- a/modules/companies/src/api/infrastructure/persistence/sequelize-work-profile.repository.ts
+++ b/modules/companies/src/api/infrastructure/persistence/sequelize-work-profile.repository.ts
@@ -1,6 +1,7 @@
 import type { UniqueID } from "@repo/rdx-ddd";
 import { Result } from "@repo/rdx-utils";
-import { QueryTypes, type Sequelize, type Transaction } from "sequelize";
+import type { Sequelize, Transaction } from "sequelize";
+import { QueryTypes } from "sequelize";
 
 import type {
   IWorkProfileInventoryService,
@@ -10,9 +11,8 @@ import type {
 import { AccessDefinitionSchema } from "../../domain/access/access-definition";
 import { WorkProfileError } from "../../domain/work-profile-values";
 
+import type { ProfileRevisionRow, ProfileRow } from "./work-profile-persistence.mapper";
 import {
-  type ProfileRevisionRow,
-  type ProfileRow,
   WorkProfilePersistenceMapper,
   persistedJson,
   profileIdentity,
diff --git a/modules/companies/src/api/infrastructure/persistence/telework-authorization-migration.ts b/modules/companies/src/api/infrastructure/persistence/telework-authorization-migration.ts
index ca50c30..fae4a77 100644
--- a/modules/companies/src/api/infrastructure/persistence/telework-authorization-migration.ts
+++ b/modules/companies/src/api/infrastructure/persistence/telework-authorization-migration.ts
@@ -1,4 +1,5 @@
-import { DataTypes, QueryTypes, type Sequelize } from "sequelize";
+import type { Sequelize } from "sequelize";
+import { DataTypes, QueryTypes } from "sequelize";
 export async function migrateTeleworkAuthorizations(database: Sequelize) {
   const query = database.getQueryInterface();
   const tables = await database.query<{ name: string }>(
diff --git a/modules/companies/src/api/infrastructure/persistence/ticket-migration.ts b/modules/companies/src/api/infrastructure/persistence/ticket-migration.ts
index 6a659ec..a3eac16 100644
--- a/modules/companies/src/api/infrastructure/persistence/ticket-migration.ts
+++ b/modules/companies/src/api/infrastructure/persistence/ticket-migration.ts
@@ -1,4 +1,5 @@
-import { DataTypes, QueryTypes, type Sequelize } from "sequelize";
+import type { Sequelize } from "sequelize";
+import { DataTypes, QueryTypes } from "sequelize";
 export async function migrateTickets(database: Sequelize) {
   const query = database.getQueryInterface();
   const tables = await database.query<{ name: string }>(
diff --git a/modules/companies/src/api/infrastructure/persistence/work-profile-migration.ts b/modules/companies/src/api/infrastructure/persistence/work-profile-migration.ts
index 62e6198..50c81b4 100644
--- a/modules/companies/src/api/infrastructure/persistence/work-profile-migration.ts
+++ b/modules/companies/src/api/infrastructure/persistence/work-profile-migration.ts
@@ -1,4 +1,5 @@
-import { DataTypes, QueryTypes, type Sequelize } from "sequelize";
+import type { Sequelize } from "sequelize";
+import { DataTypes, QueryTypes } from "sequelize";
 export async function migrateWorkProfiles(database: Sequelize) {
   const query = database.getQueryInterface();
   const rows = await database.query<{ name: string }>(
diff --git a/modules/companies/src/web/access/access-editor-dialog.tsx b/modules/companies/src/web/access/access-editor-dialog.tsx
new file mode 100644
index 0000000..4803337
--- /dev/null
+++ b/modules/companies/src/web/access/access-editor-dialog.tsx
@@ -0,0 +1,56 @@
+import { FormDialog } from "@repo/shadcn-ui/components/form-dialog";
+import type { ComponentProps } from "react";
+import { useTranslation } from "react-i18next";
+
+import type { AccessKind } from "../../common";
+
+import { createLabels } from "./access-fields";
+import { AccessForm } from "./access-form";
+
+export function AccessEditorDialog({
+  editor,
+  selected,
+  kind,
+  scope,
+  csrfToken,
+  data,
+  people,
+  complex,
+  onSaved,
+  onOpenChange,
+}: {
+  editor: string | undefined;
+  selected: ComponentProps<typeof AccessForm>["item"];
+  kind: AccessKind;
+  scope: string;
+  csrfToken: string;
+  data: ComponentProps<typeof AccessForm>["data"];
+  people: ComponentProps<typeof AccessForm>["people"];
+  complex: boolean;
+  onSaved: () => void;
+  onOpenChange: (open: boolean) => void;
+}) {
+  const { t } = useTranslation("access");
+
+  return (
+    <FormDialog
+      cancelLabel={t("cancel")}
+      formActions
+      onOpenChange={onOpenChange}
+      open={editor !== undefined}
+      title={t(selected ? "edit" : createLabels[kind])}
+      wide={complex}
+    >
+      <AccessForm
+        csrfToken={csrfToken}
+        data={data}
+        item={selected}
+        key={editor}
+        kind={kind}
+        onSaved={onSaved}
+        people={people}
+        scope={scope}
+      />
+    </FormDialog>
+  );
+}
diff --git a/modules/companies/src/web/access/access-help-dialog.tsx b/modules/companies/src/web/access/access-help-dialog.tsx
new file mode 100644
index 0000000..6fc59f4
--- /dev/null
+++ b/modules/companies/src/web/access/access-help-dialog.tsx
@@ -0,0 +1,31 @@
+import { FormDialog } from "@repo/shadcn-ui/components/form-dialog";
+import { useTranslation } from "react-i18next";
+
+import type { AccessKind } from "../../common";
+
+import { EntityHelp } from "./entity-help";
+
+export function AccessHelpDialog({
+  kind,
+  scope,
+  open,
+  onOpenChange,
+}: {
+  kind: AccessKind;
+  scope: string;
+  open: boolean;
+  onOpenChange: (open: boolean) => void;
+}) {
+  const { t } = useTranslation("access");
+
+  return (
+    <FormDialog
+      cancelLabel={t("helpClose")}
+      onOpenChange={onOpenChange}
+      open={open}
+      title={t(`kinds.${kind}`)}
+    >
+      <EntityHelp kind={kind} scope={scope} />
+    </FormDialog>
+  );
+}
diff --git a/modules/companies/src/web/access/access-workspace.tsx b/modules/companies/src/web/access/access-workspace.tsx
index bb42fbd..f11259b 100644
--- a/modules/companies/src/web/access/access-workspace.tsx
+++ b/modules/companies/src/web/access/access-workspace.tsx
@@ -1,6 +1,5 @@
 import { Button } from "@repo/shadcn-ui/components/button";
 import { EntityListHeader, EntityTable } from "@repo/shadcn-ui/components/entity-list";
-import { FormDialog } from "@repo/shadcn-ui/components/form-dialog";
 import { useQuery } from "@tanstack/react-query";
 import { useState } from "react";
 import { useTranslation } from "react-i18next";
@@ -8,12 +7,12 @@ import { useTranslation } from "react-i18next";
 import type { AccessKind, PersonDTO } from "../../common";
 
 import { AccessApiError, accessApi, accessKeys } from "./access-api";
+import { AccessEditorDialog } from "./access-editor-dialog";
 import { accessFields, createLabels } from "./access-fields";
-import { AccessForm } from "./access-form";
+import { AccessHelpDialog } from "./access-help-dialog";
 import { AccessHistory } from "./access-history";
 import { accessLabel } from "./access-labels";
 import { AccessCell } from "./access-row";
-import { EntityHelp } from "./entity-help";
 
 export function AccessWorkspacePage({
   scope,
@@ -82,14 +81,7 @@ export function AccessWorkspacePage({
         locale={i18n.language}
         title={t(`kinds.${kind}`)}
       />
-      <FormDialog
-        cancelLabel={t("helpClose")}
-        onOpenChange={setHelpOpen}
-        open={helpOpen}
-        title={t(`kinds.${kind}`)}
-      >
-        <EntityHelp kind={kind} scope={scope} />
-      </FormDialog>
+      <AccessHelpDialog kind={kind} onOpenChange={setHelpOpen} open={helpOpen} scope={scope} />
       <nav aria-label={t("sections")} className="flex flex-wrap gap-2">
         {kinds.map((value) => (
           <Button
@@ -198,29 +190,22 @@ export function AccessWorkspacePage({
             searchPlaceholder={t("search")}
             title={t(`kinds.${kind}`)}
           />
-          <FormDialog
-            cancelLabel={t("cancel")}
-            formActions
+          <AccessEditorDialog
+            complex={complex}
+            csrfToken={csrfToken}
+            data={data}
+            editor={editor}
+            kind={kind}
             onOpenChange={(open) => {
               if (!open) {
                 setEditor(undefined);
               }
             }}
-            open={editor !== undefined}
-            title={t(selected ? "edit" : createLabels[kind])}
-            wide={complex}
-          >
-            <AccessForm
-              csrfToken={csrfToken}
-              data={data}
-              item={selected}
-              key={editor}
-              kind={kind}
-              onSaved={() => setEditor(undefined)}
-              people={people}
-              scope={scope}
-            />
-          </FormDialog>
+            onSaved={() => setEditor(undefined)}
+            people={people}
+            scope={scope}
+            selected={selected}
+          />
           <AccessHistory
             item={historical}
             items={data.items}
diff --git a/modules/companies/src/web/applications/application-api.ts b/modules/companies/src/web/applications/application-api.ts
index 6d28dce..245ab77 100644
--- a/modules/companies/src/web/applications/application-api.ts
+++ b/modules/companies/src/web/applications/application-api.ts
@@ -1,7 +1,7 @@
 import { z } from "zod/v4";
 
+import type { ApplicationConfigurationInput } from "../../common/application-configurations";
 import {
-  type ApplicationConfigurationInput,
   ApplicationConfigurationResponseSchema,
   ApplicationConfigurationsResponseSchema,
 } from "../../common/application-configurations";
diff --git a/modules/companies/src/web/applications/application-configuration-editor-dialog.tsx b/modules/companies/src/web/applications/application-configuration-editor-dialog.tsx
new file mode 100644
index 0000000..7ca56fd
--- /dev/null
+++ b/modules/companies/src/web/applications/application-configuration-editor-dialog.tsx
@@ -0,0 +1,46 @@
+import { FormDialog } from "@repo/shadcn-ui/components/form-dialog";
+import type { ComponentProps } from "react";
+import { useTranslation } from "react-i18next";
+
+import type { CompanyDTO } from "../../common";
+
+import { ApplicationConfigurationForm } from "./application-configuration-form";
+
+export function ApplicationConfigurationEditorDialog({
+  configuration,
+  company,
+  csrfToken,
+  initialProfileId,
+  onClose,
+}: {
+  configuration: ComponentProps<typeof ApplicationConfigurationForm>["configuration"];
+  company: CompanyDTO;
+  csrfToken: string;
+  initialProfileId: ComponentProps<typeof ApplicationConfigurationForm>["initialProfileId"];
+  onClose: () => void;
+}) {
+  const { t } = useTranslation("companies");
+
+  return (
+    <FormDialog
+      cancelLabel={t("cancel")}
+      formActions
+      onOpenChange={(open) => {
+        if (!open) {
+          onClose();
+        }
+      }}
+      open
+      title={t(configuration ? "applications.edit" : "applications.new")}
+      wide
+    >
+      <ApplicationConfigurationForm
+        company={company}
+        configuration={configuration}
+        csrfToken={csrfToken}
+        initialProfileId={initialProfileId ?? ""}
+        onSaved={() => onClose()}
+      />
+    </FormDialog>
+  );
+}
diff --git a/modules/companies/src/web/applications/application-configuration-form.tsx b/modules/companies/src/web/applications/application-configuration-form.tsx
index cdca583..193e940 100644
--- a/modules/companies/src/web/applications/application-configuration-form.tsx
+++ b/modules/companies/src/web/applications/application-configuration-form.tsx
@@ -10,14 +10,17 @@ import { SelectWithAction } from "@repo/shadcn-ui/components/select-with-action"
 import { Textarea } from "@repo/shadcn-ui/components/textarea";
 import { useMutation, useQuery, useQueryClient } from "@tanstack/react-query";
 import { useEffect, useId, useRef, useState } from "react";
-import { type UseFormReturn, useForm } from "react-hook-form";
+import type { UseFormReturn } from "react-hook-form";
+import { useForm } from "react-hook-form";
 import { useTranslation } from "react-i18next";
 
 import type { CompanyDTO, WorkProfileDTO } from "../../common";
+import type {
+  ApplicationConfigurationDTO,
+  ApplicationConfigurationInput,
+} from "../../common/application-configurations";
 import {
   APPLICATION_STATE_TRANSITIONS,
-  type ApplicationConfigurationDTO,
-  type ApplicationConfigurationInput,
   ApplicationConfigurationInputSchema,
 } from "../../common/application-configurations";
 import { profileApi, profileKeys } from "../profiles/work-profile-api";
diff --git a/modules/companies/src/web/applications/application-configurations-page.tsx b/modules/companies/src/web/applications/application-configurations-page.tsx
index af5a21b..707dbb3 100644
--- a/modules/companies/src/web/applications/application-configurations-page.tsx
+++ b/modules/companies/src/web/applications/application-configurations-page.tsx
@@ -11,7 +11,6 @@ import {
   EntityStatus,
   EntityTable,
 } from "@repo/shadcn-ui/components/entity-list";
-import { FormDialog } from "@repo/shadcn-ui/components/form-dialog";
 import { useQuery } from "@tanstack/react-query";
 import { useState } from "react";
 import { useTranslation } from "react-i18next";
@@ -20,9 +19,9 @@ import type { CompanyDTO } from "../../common";
 import { profileApi, profileKeys } from "../profiles/work-profile-api";
 
 import { applicationApi, applicationKeys } from "./application-api";
-import { ApplicationConfigurationForm } from "./application-configuration-form";
+import { ApplicationConfigurationEditorDialog } from "./application-configuration-editor-dialog";
 import { ApplicationFeedback } from "./application-feedback";
-import { ApplicationHistory } from "./application-history";
+import { ApplicationHistoryDialog } from "./application-history-dialog";
 
 export function ApplicationConfigurationsPage({
   company,
@@ -193,41 +192,16 @@ export function ApplicationConfigurationsPage({
         />
       )}
       {editor && (
-        <FormDialog
-          cancelLabel={t("cancel")}
-          formActions
-          onOpenChange={(open) => {
-            if (!open) {
-              setEditor(undefined);
-            }
-          }}
-          open
-          title={t(edited ? "applications.edit" : "applications.new")}
-          wide
-        >
-          <ApplicationConfigurationForm
-            company={company}
-            configuration={edited}
-            csrfToken={csrfToken}
-            initialProfileId={initialProfileId ?? ""}
-            onSaved={() => setEditor(undefined)}
-          />
-        </FormDialog>
+        <ApplicationConfigurationEditorDialog
+          company={company}
+          configuration={edited}
+          csrfToken={csrfToken}
+          initialProfileId={initialProfileId ?? ""}
+          onClose={() => setEditor(undefined)}
+        />
       )}
       {viewed && (
-        <FormDialog
-          cancelLabel={t("close")}
-          onOpenChange={(open) => {
-            if (!open) {
-              setView(undefined);
-            }
-          }}
-          open
-          title={t("mail.history")}
-          wide
-        >
-          <ApplicationHistory configuration={viewed} />
-        </FormDialog>
+        <ApplicationHistoryDialog configuration={viewed} onClose={() => setView(undefined)} />
       )}
     </div>
   );
diff --git a/modules/companies/src/web/applications/application-history-dialog.tsx b/modules/companies/src/web/applications/application-history-dialog.tsx
new file mode 100644
index 0000000..b2abee7
--- /dev/null
+++ b/modules/companies/src/web/applications/application-history-dialog.tsx
@@ -0,0 +1,50 @@
+import { FormDialog } from "@repo/shadcn-ui/components/form-dialog";
+import { useTranslation } from "react-i18next";
+
+import type { ApplicationConfigurationDTO } from "../../common";
+
+export function ApplicationHistoryDialog({
+  configuration,
+  onClose,
+}: {
+  onClose: () => void;
+  configuration: ApplicationConfigurationDTO;
+}) {
+  const { t, i18n } = useTranslation("companies");
+  return (
+    <FormDialog
+      cancelLabel={t("close")}
+      onOpenChange={(open) => {
+        if (!open) {
+          onClose();
+        }
+      }}
+      open
+      title={t("mail.history")}
+      wide
+    >
+      <ol className="space-y-3">
+        {[...configuration.history].reverse().map((revision) => (
+          <li className="rounded-md border p-3 text-sm" key={revision.id}>
+            <p className="font-medium">
+              {new Intl.DateTimeFormat(i18n.language, {
+                dateStyle: "medium",
+                timeStyle: "short",
+              }).format(new Date(revision.recordedAt))}{" "}
+              · {revision.actorName}
+            </p>
+            <p>
+              {t(`applications.${revision.values.delivery}`)} · {t(`mail.${revision.values.state}`)}
+            </p>
+            {revision.values.version && (
+              <p>{t("applications.versionValue", { version: revision.values.version })}</p>
+            )}
+            {revision.values.notes && (
+              <p className="mt-2 whitespace-pre-wrap">{revision.values.notes}</p>
+            )}
+          </li>
+        ))}
+      </ol>
+    </FormDialog>
+  );
+}
diff --git a/modules/companies/src/web/applications/application-history.tsx b/modules/companies/src/web/applications/application-history.tsx
deleted file mode 100644
index 19f76f4..0000000
--- a/modules/companies/src/web/applications/application-history.tsx
+++ /dev/null
@@ -1,35 +0,0 @@
-import { useTranslation } from "react-i18next";
-
-import type { ApplicationConfigurationDTO } from "../../common";
-
-export function ApplicationHistory({
-  configuration,
-}: {
-  configuration: ApplicationConfigurationDTO;
-}) {
-  const { t, i18n } = useTranslation("companies");
-  return (
-    <ol className="space-y-3">
-      {[...configuration.history].reverse().map((revision) => (
-        <li className="rounded-md border p-3 text-sm" key={revision.id}>
-          <p className="font-medium">
-            {new Intl.DateTimeFormat(i18n.language, {
-              dateStyle: "medium",
-              timeStyle: "short",
-            }).format(new Date(revision.recordedAt))}{" "}
-            · {revision.actorName}
-          </p>
-          <p>
-            {t(`applications.${revision.values.delivery}`)} · {t(`mail.${revision.values.state}`)}
-          </p>
-          {revision.values.version && (
-            <p>{t("applications.versionValue", { version: revision.values.version })}</p>
-          )}
-          {revision.values.notes && (
-            <p className="mt-2 whitespace-pre-wrap">{revision.values.notes}</p>
-          )}
-        </li>
-      ))}
-    </ol>
-  );
-}
diff --git a/modules/companies/src/web/certificates/certificate-api.ts b/modules/companies/src/web/certificates/certificate-api.ts
index 61d003b..18a13eb 100644
--- a/modules/companies/src/web/certificates/certificate-api.ts
+++ b/modules/companies/src/web/certificates/certificate-api.ts
@@ -1,7 +1,7 @@
 import { z } from "zod/v4";
 
+import type { CertificateConfigurationInput } from "../../common/certificate-configurations";
 import {
-  type CertificateConfigurationInput,
   CertificateConfigurationResponseSchema,
   CertificateConfigurationsResponseSchema,
 } from "../../common/certificate-configurations";
diff --git a/modules/companies/src/web/certificates/certificate-configuration-editor-dialog.tsx b/modules/companies/src/web/certificates/certificate-configuration-editor-dialog.tsx
new file mode 100644
index 0000000..af47a2b
--- /dev/null
+++ b/modules/companies/src/web/certificates/certificate-configuration-editor-dialog.tsx
@@ -0,0 +1,46 @@
+import { FormDialog } from "@repo/shadcn-ui/components/form-dialog";
+import type { ComponentProps } from "react";
+import { useTranslation } from "react-i18next";
+
+import type { CompanyDTO } from "../../common";
+
+import { CertificateConfigurationForm } from "./certificate-configuration-form";
+
+export function CertificateConfigurationEditorDialog({
+  configuration,
+  company,
+  csrfToken,
+  initialProfileId,
+  onClose,
+}: {
+  configuration: ComponentProps<typeof CertificateConfigurationForm>["configuration"];
+  company: CompanyDTO;
+  csrfToken: string;
+  initialProfileId: ComponentProps<typeof CertificateConfigurationForm>["initialProfileId"];
+  onClose: () => void;
+}) {
+  const { t } = useTranslation("companies");
+
+  return (
+    <FormDialog
+      cancelLabel={t("cancel")}
+      formActions
+      onOpenChange={(open) => {
+        if (!open) {
+          onClose();
+        }
+      }}
+      open
+      title={t(configuration ? "certificates.edit" : "certificates.new")}
+      wide
+    >
+      <CertificateConfigurationForm
+        company={company}
+        configuration={configuration}
+        csrfToken={csrfToken}
+        initialProfileId={initialProfileId ?? ""}
+        onSaved={() => onClose()}
+      />
+    </FormDialog>
+  );
+}
diff --git a/modules/companies/src/web/certificates/certificate-configuration-form.tsx b/modules/companies/src/web/certificates/certificate-configuration-form.tsx
index 5379d29..9be9e14 100644
--- a/modules/companies/src/web/certificates/certificate-configuration-form.tsx
+++ b/modules/companies/src/web/certificates/certificate-configuration-form.tsx
@@ -14,10 +14,12 @@ import { useForm } from "react-hook-form";
 import { useTranslation } from "react-i18next";
 
 import type { CompanyDTO, WorkProfileDTO } from "../../common";
+import type {
+  CertificateConfigurationDTO,
+  CertificateConfigurationInput,
+} from "../../common/certificate-configurations";
 import {
   CERTIFICATE_STATE_TRANSITIONS,
-  type CertificateConfigurationDTO,
-  type CertificateConfigurationInput,
   CertificateConfigurationInputSchema,
 } from "../../common/certificate-configurations";
 import { profileApi, profileKeys } from "../profiles/work-profile-api";
diff --git a/modules/companies/src/web/certificates/certificate-configurations-page.tsx b/modules/companies/src/web/certificates/certificate-configurations-page.tsx
index 2a81559..64f3f73 100644
--- a/modules/companies/src/web/certificates/certificate-configurations-page.tsx
+++ b/modules/companies/src/web/certificates/certificate-configurations-page.tsx
@@ -11,7 +11,6 @@ import {
   EntityStatus,
   EntityTable,
 } from "@repo/shadcn-ui/components/entity-list";
-import { FormDialog } from "@repo/shadcn-ui/components/form-dialog";
 import { useQuery } from "@tanstack/react-query";
 import { useState } from "react";
 import { useTranslation } from "react-i18next";
@@ -20,9 +19,9 @@ import type { CompanyDTO } from "../../common";
 import { profileApi, profileKeys } from "../profiles/work-profile-api";
 
 import { certificateApi, certificateKeys } from "./certificate-api";
-import { CertificateConfigurationForm } from "./certificate-configuration-form";
+import { CertificateConfigurationEditorDialog } from "./certificate-configuration-editor-dialog";
 import { CertificateFeedback } from "./certificate-feedback";
-import { CertificateHistory } from "./certificate-history";
+import { CertificateHistoryDialog } from "./certificate-history-dialog";
 
 export function CertificateConfigurationsPage({
   company,
@@ -200,41 +199,16 @@ export function CertificateConfigurationsPage({
         />
       )}
       {editor && (
-        <FormDialog
-          cancelLabel={t("cancel")}
-          formActions
-          onOpenChange={(open) => {
-            if (!open) {
-              setEditor(undefined);
-            }
-          }}
-          open
-          title={t(edited ? "certificates.edit" : "certificates.new")}
-          wide
-        >
-          <CertificateConfigurationForm
-            company={company}
-            configuration={edited}
-            csrfToken={csrfToken}
-            initialProfileId={initialProfileId ?? ""}
-            onSaved={() => setEditor(undefined)}
-          />
-        </FormDialog>
+        <CertificateConfigurationEditorDialog
+          company={company}
+          configuration={edited}
+          csrfToken={csrfToken}
+          initialProfileId={initialProfileId ?? ""}
+          onClose={() => setEditor(undefined)}
+        />
       )}
       {viewed && (
-        <FormDialog
-          cancelLabel={t("close")}
-          onOpenChange={(open) => {
-            if (!open) {
-              setView(undefined);
-            }
-          }}
-          open
-          title={t("mail.history")}
-          wide
-        >
-          <CertificateHistory configuration={viewed} />
-        </FormDialog>
+        <CertificateHistoryDialog configuration={viewed} onClose={() => setView(undefined)} />
       )}
     </div>
   );
diff --git a/modules/companies/src/web/certificates/certificate-history-dialog.tsx b/modules/companies/src/web/certificates/certificate-history-dialog.tsx
new file mode 100644
index 0000000..9bc6876
--- /dev/null
+++ b/modules/companies/src/web/certificates/certificate-history-dialog.tsx
@@ -0,0 +1,48 @@
+import { FormDialog } from "@repo/shadcn-ui/components/form-dialog";
+import { useTranslation } from "react-i18next";
+
+import type { CertificateConfigurationDTO } from "../../common";
+
+export function CertificateHistoryDialog({
+  configuration,
+  onClose,
+}: {
+  onClose: () => void;
+  configuration: CertificateConfigurationDTO;
+}) {
+  const { t, i18n } = useTranslation("companies");
+  return (
+    <FormDialog
+      cancelLabel={t("close")}
+      onOpenChange={(open) => {
+        if (!open) {
+          onClose();
+        }
+      }}
+      open
+      title={t("mail.history")}
+      wide
+    >
+      <ol className="space-y-3">
+        {[...configuration.history].reverse().map((revision) => (
+          <li className="rounded-md border p-3 text-sm" key={revision.id}>
+            <p className="font-medium">
+              {new Intl.DateTimeFormat(i18n.language, {
+                dateStyle: "medium",
+                timeStyle: "short",
+              }).format(new Date(revision.recordedAt))}{" "}
+              · {revision.actorName}
+            </p>
+            <p>{t(`mail.${revision.values.state}`)}</p>
+            {revision.values.location && (
+              <p>{t("certificates.locationValue", { location: revision.values.location })}</p>
+            )}
+            {revision.values.notes && (
+              <p className="mt-2 whitespace-pre-wrap">{revision.values.notes}</p>
+            )}
+          </li>
+        ))}
+      </ol>
+    </FormDialog>
+  );
+}
diff --git a/modules/companies/src/web/certificates/certificate-history.tsx b/modules/companies/src/web/certificates/certificate-history.tsx
deleted file mode 100644
index 4dfb62e..0000000
--- a/modules/companies/src/web/certificates/certificate-history.tsx
+++ /dev/null
@@ -1,33 +0,0 @@
-import { useTranslation } from "react-i18next";
-
-import type { CertificateConfigurationDTO } from "../../common";
-
-export function CertificateHistory({
-  configuration,
-}: {
-  configuration: CertificateConfigurationDTO;
-}) {
-  const { t, i18n } = useTranslation("companies");
-  return (
-    <ol className="space-y-3">
-      {[...configuration.history].reverse().map((revision) => (
-        <li className="rounded-md border p-3 text-sm" key={revision.id}>
-          <p className="font-medium">
-            {new Intl.DateTimeFormat(i18n.language, {
-              dateStyle: "medium",
-              timeStyle: "short",
-            }).format(new Date(revision.recordedAt))}{" "}
-            · {revision.actorName}
-          </p>
-          <p>{t(`mail.${revision.values.state}`)}</p>
-          {revision.values.location && (
-            <p>{t("certificates.locationValue", { location: revision.values.location })}</p>
-          )}
-          {revision.values.notes && (
-            <p className="mt-2 whitespace-pre-wrap">{revision.values.notes}</p>
-          )}
-        </li>
-      ))}
-    </ol>
-  );
-}
diff --git a/modules/companies/src/web/components/assignment-editor-dialog.tsx b/modules/companies/src/web/components/assignment-editor-dialog.tsx
new file mode 100644
index 0000000..139be4e
--- /dev/null
+++ b/modules/companies/src/web/components/assignment-editor-dialog.tsx
@@ -0,0 +1,46 @@
+import { FormDialog } from "@repo/shadcn-ui/components/form-dialog";
+import type { ComponentProps } from "react";
+import { useTranslation } from "react-i18next";
+
+import type { CompanyDTO } from "../../common";
+
+import { AssignmentForm } from "./assignment-form";
+
+export function AssignmentEditorDialog({
+  editor,
+  selected,
+  company,
+  csrfToken,
+  personId,
+  onSaved,
+  onOpenChange,
+}: {
+  editor: string | undefined;
+  selected: ComponentProps<typeof AssignmentForm>["assignment"];
+  company: CompanyDTO;
+  csrfToken: string;
+  personId: string;
+  onSaved: () => void;
+  onOpenChange: (open: boolean) => void;
+}) {
+  const { t } = useTranslation("companies");
+
+  return (
+    <FormDialog
+      cancelLabel={t("cancel")}
+      formActions
+      onOpenChange={onOpenChange}
+      open={editor !== undefined}
+      title={t(selected ? "editAssignment" : "addAssignment")}
+    >
+      <AssignmentForm
+        assignment={selected}
+        company={company}
+        csrfToken={csrfToken}
+        key={editor}
+        onSaved={onSaved}
+        personId={personId}
+      />
+    </FormDialog>
+  );
+}
diff --git a/modules/companies/src/web/components/assignment-form.tsx b/modules/companies/src/web/components/assignment-form.tsx
index d564737..247358f 100644
--- a/modules/companies/src/web/components/assignment-form.tsx
+++ b/modules/companies/src/web/components/assignment-form.tsx
@@ -1,7 +1,7 @@
 import { zodResolver } from "@hookform/resolvers/zod";
 import { Button } from "@repo/shadcn-ui/components/button";
 import { Checkbox } from "@repo/shadcn-ui/components/checkbox";
-import { FormActions, FormDialog } from "@repo/shadcn-ui/components/form-dialog";
+import { FormActions } from "@repo/shadcn-ui/components/form-dialog";
 import { Input } from "@repo/shadcn-ui/components/input";
 import { Label } from "@repo/shadcn-ui/components/label";
 import { SelectWithAction } from "@repo/shadcn-ui/components/select-with-action";
@@ -16,7 +16,7 @@ import { EntityHelp } from "../access/entity-help";
 import { companyApi, companyKeys } from "../api/company-api";
 
 import { CompanyFeedback } from "./company-feedback";
-import { DepartmentForm } from "./department-form";
+import { DepartmentEditorDialog } from "./department-editor-dialog";
 
 const FormSchema = z.strictObject({
   departmentId: z.uuid(),
@@ -157,30 +157,24 @@ export function AssignmentForm({
         </FormActions>
       </form>
       {creatingDepartment && (
-        <FormDialog
-          cancelLabel={t("cancel")}
-          formActions
+        <DepartmentEditorDialog
+          companyId={company.id}
+          csrfToken={csrfToken}
           onOpenChange={(open) => {
             if (!open) {
               setCreatingDepartment(false);
             }
           }}
+          onSaved={(departmentId) => {
+            form.setValue("departmentId", departmentId, {
+              shouldDirty: true,
+              shouldValidate: true,
+            });
+            setCreatingDepartment(false);
+          }}
           open
-          title={t("newDepartment")}
-        >
-          <DepartmentForm
-            companyId={company.id}
-            csrfToken={csrfToken}
-            onSaved={(departmentId) => {
-              form.setValue("departmentId", departmentId, {
-                shouldDirty: true,
-                shouldValidate: true,
-              });
-              setCreatingDepartment(false);
-            }}
-            requireActive
-          />
-        </FormDialog>
+          requireActive
+        />
       )}
     </>
   );
diff --git a/modules/companies/src/web/components/assignment-history-dialog.tsx b/modules/companies/src/web/components/assignment-history-dialog.tsx
new file mode 100644
index 0000000..eb7be1c
--- /dev/null
+++ b/modules/companies/src/web/components/assignment-history-dialog.tsx
@@ -0,0 +1,47 @@
+import { FormDialog } from "@repo/shadcn-ui/components/form-dialog";
+import { useTranslation } from "react-i18next";
+
+import type { CompanyDTO } from "../../common";
+
+export function AssignmentHistoryDialog({
+  history,
+  departmentName,
+  onOpenChange,
+}: {
+  history: CompanyDTO["assignments"][number] | undefined;
+  departmentName: (id: string) => string;
+  onOpenChange: (open: boolean) => void;
+}) {
+  const { t, i18n } = useTranslation("companies");
+
+  return (
+    <FormDialog
+      cancelLabel={t("close")}
+      onOpenChange={onOpenChange}
+      open={history !== undefined}
+      title={t("assignmentHistory")}
+    >
+      {history && (
+        <div className="space-y-4">
+          <p>{departmentName(history.departmentId)}</p>
+          {[...history.history].reverse().map((revision) => (
+            <div className="space-y-1 rounded-md border p-3" key={revision.id}>
+              <p className="text-sm font-medium">
+                {new Date(revision.recordedAt).toLocaleString(i18n.language)}
+              </p>
+              <p>
+                {t("position")}: {revision.position ?? "—"}
+              </p>
+              <p>
+                {revision.startDate} → {revision.endDate ?? t("currentAssignment")}
+              </p>
+              <p>
+                {t("primaryDepartment")}: {t(revision.isPrimary ? "yes" : "no")}
+              </p>
+            </div>
+          ))}
+        </div>
+      )}
+    </FormDialog>
+  );
+}
diff --git a/modules/companies/src/web/components/companies-page.tsx b/modules/companies/src/web/components/companies-page.tsx
index 375a493..02568f4 100644
--- a/modules/companies/src/web/components/companies-page.tsx
+++ b/modules/companies/src/web/components/companies-page.tsx
@@ -6,7 +6,6 @@ import {
   EntityStatus,
   EntityTable,
 } from "@repo/shadcn-ui/components/entity-list";
-import { FormDialog } from "@repo/shadcn-ui/components/form-dialog";
 import { useQuery } from "@tanstack/react-query";
 import type { ColumnDef } from "@tanstack/react-table";
 import { getCoreRowModel, getFilteredRowModel, useReactTable } from "@tanstack/react-table";
@@ -17,8 +16,8 @@ import type { CompanySummaryDTO } from "../../common";
 import { companyApi, companyKeys } from "../api/company-api";
 
 import { CompanyDetail } from "./company-detail";
+import { CompanyEditorDialog } from "./company-editor-dialog";
 import { CompanyFeedback } from "./company-feedback";
-import { CompanyForm } from "./company-form";
 
 const EMPTY_COMPANIES: CompanySummaryDTO[] = [];
 const COMPANY_COLUMNS: ColumnDef<CompanySummaryDTO>[] = [
@@ -169,22 +168,15 @@ export function CompaniesPage({
           title={t("title")}
         />
       )}
-      <FormDialog
-        cancelLabel={t("cancel")}
-        formActions
+      <CompanyEditorDialog
+        csrfToken={csrfToken}
+        onCreated={(companyId) => {
+          setCreateOpen(false);
+          selectCompany(companyId);
+        }}
         onOpenChange={setCreateOpen}
         open={createOpen}
-        title={t("newCompany")}
-      >
-        <CompanyForm
-          csrfToken={csrfToken}
-          onCreated={(companyId) => {
-            setCreateOpen(false);
-            selectCompany(companyId);
-          }}
-          showTitle={false}
-        />
-      </FormDialog>
+      />
     </div>
   );
 }
diff --git a/modules/companies/src/web/components/companies-workspace.tsx b/modules/companies/src/web/components/companies-workspace.tsx
index 5d55718..a4eb5e6 100644
--- a/modules/companies/src/web/components/companies-workspace.tsx
+++ b/modules/companies/src/web/components/companies-workspace.tsx
@@ -1,18 +1,4 @@
 import { Button } from "@repo/shadcn-ui/components/button";
-import { FormDialog } from "@repo/shadcn-ui/components/form-dialog";
-import { Input } from "@repo/shadcn-ui/components/input";
-import {
-  BellIcon,
-  Building2Icon,
-  ChevronDownIcon,
-  ChevronRightIcon,
-  DatabaseIcon,
-  HomeIcon,
-  SearchIcon,
-  SettingsIcon,
-  TicketIcon,
-  WrenchIcon,
-} from "@repo/shadcn-ui/lib/icons";
 import { useQuery } from "@tanstack/react-query";
 import type { ReactNode } from "react";
 import { useState } from "react";
@@ -23,7 +9,10 @@ import { companyApi, companyKeys } from "../api/company-api";
 import { CompanyDetail } from "./company-detail";
 import { CompanyFeedback } from "./company-feedback";
 import { WorkspaceContent } from "./workspace-content";
+import { WorkspaceHeader } from "./workspace-header";
 import type { WorkspaceLocation } from "./workspace-location";
+import { WorkspaceSettingsDialog } from "./workspace-settings-dialog";
+import { WorkspaceSidebar } from "./workspace-sidebar";
 
 export function CompaniesWorkspace({
   csrfToken,
@@ -38,230 +27,44 @@ export function CompaniesWorkspace({
 }) {
   const { t } = useTranslation("companies");
   const { t: coreTranslation } = useTranslation("core");
-  const { t: resourceTranslation } = useTranslation("resources");
-  const { t: assetTranslation } = useTranslation("assets");
-  const { t: accessTranslation } = useTranslation("access");
+
   const query = useQuery({ queryKey: companyKeys.list, queryFn: companyApi.list });
   const [location, setLocation] = useState<WorkspaceLocation>();
   const [catalog, setCatalog] = useState<
     "access" | "assets" | "brands" | "resources" | "intervention-templates"
   >("access");
   const [settingsOpen, setSettingsOpen] = useState(false);
-  const [search, setSearch] = useState("");
+
   const companies = query.data?.companies ?? [];
   const current = location ?? { area: "home" };
   const selectCompany = (id: string) => setLocation({ area: "company", id, section: "inventory" });
 
   return (
     <div className="desk-workspace">
-      <aside className="desk-sidebar">
-        <div className="desk-brand">
-          <svg aria-hidden="true" viewBox="0 0 36 30">
-            <path
-              d="M5 24 13 7l9 17 9-18"
-              fill="none"
-              stroke="currentColor"
-              strokeLinecap="round"
-              strokeLinejoin="round"
-              strokeWidth="7"
-            />
-          </svg>
-          <span>Metis Desk</span>
-        </div>
-        <nav aria-label={t("companySpaces")} className="desk-company-rail">
-          {(
-            [
-              ["home", "dashboard.title", HomeIcon],
-              ["directory", "title", Building2Icon],
-              ["catalogs", "shell.catalogs", DatabaseIcon],
-              ["tickets", "shell.tickets", TicketIcon],
-              ["interventions", "shell.interventions", WrenchIcon],
-            ] as const
-          ).map(([area, label, Icon]) => (
-            <Button
-              aria-label={t(label)}
-              aria-pressed={current.area === area}
-              className="desk-space-button"
-              key={area}
-              onClick={() => setLocation({ area })}
-              variant="ghost"
-            >
-              <Icon aria-hidden="true" />
-              <span>{t(label)}</span>
-              {area === "catalogs" && (
-                <ChevronRightIcon aria-hidden="true" className="desk-nav-chevron" />
-              )}
-            </Button>
-          ))}
-          {current.area === "catalogs" && (
-            <nav aria-label={t("globalCatalogs")} className="desk-catalog-navigation">
-              <>
-                <Button
-                  aria-pressed={catalog === "access"}
-                  onClick={() => setCatalog("access")}
-                  variant="ghost"
-                >
-                  {accessTranslation("catalogTitle")}
-                </Button>
-                <Button
-                  aria-pressed={catalog === "assets"}
-                  onClick={() => setCatalog("assets")}
-                  variant="ghost"
-                >
-                  {assetTranslation("title")}
-                </Button>
-                <Button
-                  aria-pressed={catalog === "intervention-templates"}
-                  onClick={() => setCatalog("intervention-templates")}
-                  variant="ghost"
-                >
-                  {t("interventionTemplates.title")}
-                </Button>
-                <Button
-                  aria-pressed={catalog === "brands"}
-                  onClick={() => setCatalog("brands")}
-                  variant="ghost"
-                >
-                  {assetTranslation("brands.title")}
-                </Button>
-                <Button
-                  aria-pressed={catalog === "resources"}
-                  onClick={() => setCatalog("resources")}
-                  variant="ghost"
-                >
-                  {resourceTranslation("title")}
-                </Button>
-              </>
-            </nav>
-          )}
-          <Button
-            className="desk-space-button"
-            onClick={() => setSettingsOpen(true)}
-            variant="ghost"
-          >
-            <SettingsIcon aria-hidden="true" />
-            <span>{coreTranslation("shell.settings")}</span>
-          </Button>
-          <div className="desk-rail-separator" />
-          {companies.map((company) => (
-            <Button
-              aria-label={company.name}
-              aria-pressed={current.area === "company" && current.id === company.id}
-              className="desk-space-button"
-              key={company.id}
-              onClick={() => selectCompany(company.id)}
-              title={company.name}
-              variant="ghost"
-            >
-              <Building2Icon aria-hidden="true" />
-              <span>{company.name}</span>
-            </Button>
-          ))}
-        </nav>
-      </aside>
+      <WorkspaceSidebar
+        catalog={catalog}
+        companies={companies}
+        current={current}
+        onNavigate={setLocation}
+        onSelectCatalog={setCatalog}
+        onSelectCompany={selectCompany}
+        onSettings={() => setSettingsOpen(true)}
+      />
       <div className="desk-workspace-content">
-        <header className="desk-global-header">
-          <div className="desk-search">
-            <SearchIcon aria-hidden="true" />
-            <Input
-              aria-label={coreTranslation("shell.search")}
-              onChange={(event) => setSearch(event.target.value)}
-              onKeyDown={(event) => {
-                if (event.key === "Escape") {
-                  setSearch("");
-                }
-              }}
-              placeholder={coreTranslation("shell.search")}
-              value={search}
-            />
-            {search.trim() && (
-              <section
-                aria-label={coreTranslation("shell.results")}
-                className="desk-search-results"
-              >
-                {companies
-                  .filter((company) =>
-                    company.name.toLocaleLowerCase().includes(search.trim().toLocaleLowerCase())
-                  )
-                  .map((company) => (
-                    <Button
-                      key={company.id}
-                      onClick={() => {
-                        selectCompany(company.id);
-                        setSearch("");
-                      }}
-                      variant="ghost"
-                    >
-                      {company.name}
-                    </Button>
-                  ))}
-                {(
-                  [
-                    ["home", "dashboard.title"],
-                    ["directory", "title"],
-                    ["catalogs", "shell.catalogs"],
-                    ["tickets", "tickets.global"],
-                    ["interventions", "interventions.global"],
-                  ] as const
-                )
-                  .filter(([, label]) =>
-                    t(label).toLocaleLowerCase().includes(search.trim().toLocaleLowerCase())
-                  )
-                  .map(([area, label]) => (
-                    <Button
-                      key={area}
-                      onClick={() => {
-                        setLocation({ area });
-                        setSearch("");
-                      }}
-                      variant="ghost"
-                    >
-                      {t(label)}
-                    </Button>
-                  ))}
-                <p>{coreTranslation("shell.searchScope")}</p>
-              </section>
-            )}
-          </div>
-          <span
-            aria-label={coreTranslation("shell.notificationsUnavailable")}
-            className="desk-notifications"
-            role="img"
-            title={coreTranslation("shell.notificationsUnavailable")}
-          >
-            <BellIcon aria-hidden="true" />
-          </span>
-          <details className="desk-profile">
-            <summary aria-label={coreTranslation("shell.profile")}>
-              <span aria-hidden="true" className="desk-avatar">
-                {userName
-                  .trim()
-                  .split(/\s+/)
-                  .slice(0, 2)
-                  .map((word) => word[0])
-                  .join("")}
-              </span>
-              <span className="desk-profile-copy">
-                <strong>{userName}</strong>
-                <span>{coreTranslation("shell.supportWorkspace")}</span>
-              </span>
-              <ChevronDownIcon aria-hidden="true" />
-            </summary>
-            <div className="desk-profile-menu">
-              {accountNavigation}
-              {languageSwitcher}
-            </div>
-          </details>
-        </header>
-        <FormDialog
-          cancelLabel={t("cancel")}
+        <WorkspaceHeader
+          accountNavigation={accountNavigation}
+          companies={companies}
+          languageSwitcher={languageSwitcher}
+          onNavigate={setLocation}
+          onSelectCompany={selectCompany}
+          userName={userName}
+        />
+        <WorkspaceSettingsDialog
+          accountNavigation={accountNavigation}
+          languageSwitcher={languageSwitcher}
           onOpenChange={setSettingsOpen}
           open={settingsOpen}
-          title={coreTranslation("shell.settings")}
-        >
-          {accountNavigation}
-          {languageSwitcher}
-        </FormDialog>
+        />
         <span className="sr-only">{coreTranslation("workspace")}</span>
         {query.isPending && (
           <p className="p-6" role="status">
diff --git a/modules/companies/src/web/components/company-detail.tsx b/modules/companies/src/web/components/company-detail.tsx
index 78f55f1..875c541 100644
--- a/modules/companies/src/web/components/company-detail.tsx
+++ b/modules/companies/src/web/components/company-detail.tsx
@@ -1,5 +1,4 @@
 import { Button } from "@repo/shadcn-ui/components/button";
-import { FormDialog } from "@repo/shadcn-ui/components/form-dialog";
 import {
   BoxIcon,
   BriefcaseIcon,
@@ -17,8 +16,8 @@ import { useTranslation } from "react-i18next";
 
 import { companyApi, companyKeys } from "../api/company-api";
 
+import { CompanyEditorDialog } from "./company-editor-dialog";
 import { CompanyFeedback } from "./company-feedback";
-import { CompanyForm } from "./company-form";
 import { CompanySection } from "./company-section";
 import type { CompanyTab } from "./company-tab";
 
@@ -96,21 +95,13 @@ export function CompanyDetail({
               {t("editCompany")}
             </Button>
           </div>
-          <FormDialog
-            cancelLabel={t("cancel")}
-            formActions
+          <CompanyEditorDialog
+            company={company}
+            csrfToken={csrfToken}
             onOpenChange={setEditOpen}
+            onSaved={() => setEditOpen(false)}
             open={editOpen}
-            title={t("editCompany")}
-          >
-            <CompanyForm
-              company={company}
-              csrfToken={csrfToken}
-              key={company.id}
-              onSaved={() => setEditOpen(false)}
-              showTitle={false}
-            />
-          </FormDialog>
+          />
           <nav aria-label={t("companySections")} className={layout.navigation}>
             {(
               [
diff --git a/modules/companies/src/web/components/company-editor-dialog.tsx b/modules/companies/src/web/components/company-editor-dialog.tsx
new file mode 100644
index 0000000..a13383e
--- /dev/null
+++ b/modules/companies/src/web/components/company-editor-dialog.tsx
@@ -0,0 +1,27 @@
+import { FormDialog } from "@repo/shadcn-ui/components/form-dialog";
+import type { ComponentProps } from "react";
+import { useTranslation } from "react-i18next";
+
+import { CompanyForm } from "./company-form";
+
+export function CompanyEditorDialog({
+  open,
+  onOpenChange,
+  ...formProps
+}: Omit<ComponentProps<typeof CompanyForm>, "showTitle"> & {
+  open: boolean;
+  onOpenChange: (open: boolean) => void;
+}) {
+  const { t } = useTranslation("companies");
+  return (
+    <FormDialog
+      cancelLabel={t("cancel")}
+      formActions
+      onOpenChange={onOpenChange}
+      open={open}
+      title={t(formProps.company ? "editCompany" : "newCompany")}
+    >
+      <CompanyForm {...formProps} key={formProps.company?.id ?? "new"} showTitle={false} />
+    </FormDialog>
+  );
+}
diff --git a/modules/companies/src/web/components/company-inventory.tsx b/modules/companies/src/web/components/company-inventory.tsx
index ff44887..3823616 100644
--- a/modules/companies/src/web/components/company-inventory.tsx
+++ b/modules/companies/src/web/components/company-inventory.tsx
@@ -1,12 +1,9 @@
 import { AssetInventoryPage, WorkstationsPage } from "@metis/assets/client";
-import { FormDialog } from "@repo/shadcn-ui/components/form-dialog";
 import { useState } from "react";
-import { useTranslation } from "react-i18next";
 
 import type { CompanyDTO } from "../../common";
 
-import { PersonForm } from "./person-form";
-import { SiteForm } from "./site-form";
+import { InventoryQuickCreateDialog } from "./inventory-quick-create-dialog";
 export function CompanyInventory({
   company,
   csrfToken,
@@ -20,8 +17,6 @@ export function CompanyInventory({
   initialId?: string | undefined;
   initialCreate?: boolean | undefined;
 }) {
-  const { t } = useTranslation("companies");
-  const { t: assetTranslation } = useTranslation("assets");
   const [quick, setQuick] = useState<{
     kind: "site" | "person";
     onCreated: (id: string) => void;
@@ -41,40 +36,13 @@ export function CompanyInventory({
         }}
       />
       {quick && (
-        <FormDialog
-          cancelLabel={t("cancel")}
-          formActions
-          onOpenChange={(open) => {
-            if (!open) {
-              setQuick(undefined);
-            }
-          }}
-          open
-          title={t(quick.kind === "site" ? "newSite" : "newPerson")}
-        >
-          <p className="text-sm text-muted-foreground">{assetTranslation("relatedNotice")}</p>
-          {quick.kind === "site" ? (
-            <SiteForm
-              companyId={company.id}
-              csrfToken={csrfToken}
-              onSaved={(id) => {
-                quick.onCreated(id);
-                setQuick(undefined);
-              }}
-              showTitle={false}
-            />
-          ) : (
-            <PersonForm
-              companyId={company.id}
-              csrfToken={csrfToken}
-              onSaved={(id) => {
-                quick.onCreated(id);
-                setQuick(undefined);
-              }}
-              requireActive
-            />
-          )}
-        </FormDialog>
+        <InventoryQuickCreateDialog
+          companyId={company.id}
+          csrfToken={csrfToken}
+          kind={quick.kind}
+          onClose={() => setQuick(undefined)}
+          onCreated={quick.onCreated}
+        />
       )}
     </>
   );
diff --git a/modules/companies/src/web/components/dashboard-activity-panel.tsx b/modules/companies/src/web/components/dashboard-activity-panel.tsx
new file mode 100644
index 0000000..f519b3b
--- /dev/null
+++ b/modules/companies/src/web/components/dashboard-activity-panel.tsx
@@ -0,0 +1,71 @@
+import { ClockIcon } from "@repo/shadcn-ui/lib/icons";
+import { useQuery } from "@tanstack/react-query";
+import { useTranslation } from "react-i18next";
+
+import type { DashboardNavigation } from "./dashboard-api";
+import { dashboardApi, dashboardKeys, entryDestination } from "./dashboard-api";
+import { BlockState } from "./dashboard-block";
+import { KIND_ICONS } from "./dashboard-kind-icons";
+import { DashboardPanel } from "./dashboard-panel";
+export function DashboardActivityPanel({
+  companyId,
+  onDetails,
+  onNavigate,
+}: {
+  companyId: string | undefined;
+  onDetails: () => void;
+  onNavigate: (destination: DashboardNavigation) => void;
+}) {
+  const { t, i18n } = useTranslation("companies");
+  const activity = useQuery({
+    queryKey: dashboardKeys.block("activity", companyId),
+    queryFn: ({ signal }) => dashboardApi.activity(signal, companyId),
+    staleTime: 0,
+  });
+  const date = (value: string | null) =>
+    value
+      ? new Intl.DateTimeFormat(i18n.language, { dateStyle: "medium", timeStyle: "short" }).format(
+          new Date(value)
+        )
+      : "—";
+
+  return (
+    <DashboardPanel action={onDetails} icon={<ClockIcon />} title={t("dashboard.recentActivity")}>
+      <BlockState
+        empty={!activity.data?.items.length}
+        emptyText={t("dashboard.noRecentActivity")}
+        query={activity}
+      >
+        <ol className="dashboard-timeline">
+          {activity.data?.items.slice(0, 4).map((item) => {
+            const Icon = KIND_ICONS[item.kind];
+            return (
+              <li key={item.eventId ?? item.id}>
+                <time
+                  className="text-xs text-muted-foreground"
+                  dateTime={item.recordedAt ?? undefined}
+                >
+                  {date(item.recordedAt)}
+                </time>
+                <Icon aria-hidden="true" className="size-5 text-primary shrink-0" />
+                <div>
+                  <button
+                    className="dashboard-link"
+                    onClick={() => onNavigate(entryDestination(item))}
+                    type="button"
+                  >
+                    {t("dashboard.recordUpdated", { name: item.reference ?? item.name })}
+                  </button>
+                  <p className="text-xs text-muted-foreground">
+                    {item.companyName}
+                    {item.actorName ? ` · ${item.actorName}` : ""}
+                  </p>
+                </div>
+              </li>
+            );
+          })}
+        </ol>
+      </BlockState>
+    </DashboardPanel>
+  );
+}
diff --git a/modules/companies/src/web/components/dashboard-api.ts b/modules/companies/src/web/components/dashboard-api.ts
index 6bf5f71..13e50b9 100644
--- a/modules/companies/src/web/components/dashboard-api.ts
+++ b/modules/companies/src/web/components/dashboard-api.ts
@@ -1,7 +1,7 @@
+import type { DashboardDetailsQuery } from "../../common/dashboard";
 import {
   DashboardAttentionSchema,
   DashboardCompaniesSchema,
-  type DashboardDetailsQuery,
   DashboardEntriesSchema,
   DashboardSummarySchema,
 } from "../../common/dashboard";
diff --git a/modules/companies/src/web/components/dashboard-attention-panel.tsx b/modules/companies/src/web/components/dashboard-attention-panel.tsx
new file mode 100644
index 0000000..619d26c
--- /dev/null
+++ b/modules/companies/src/web/components/dashboard-attention-panel.tsx
@@ -0,0 +1,78 @@
+import {
+  BoxIcon,
+  ChevronRightIcon,
+  FileKeyIcon,
+  TriangleAlertIcon,
+  UserRoundXIcon,
+  UsersIcon,
+} from "@repo/shadcn-ui/lib/icons";
+import { useQuery } from "@tanstack/react-query";
+import { useTranslation } from "react-i18next";
+
+import type { DashboardIssue } from "../../common/dashboard";
+
+import { dashboardApi, dashboardKeys } from "./dashboard-api";
+import { BlockState } from "./dashboard-block";
+import { DashboardPanel } from "./dashboard-panel";
+
+const ISSUE_ICONS = {
+  certificate: FileKeyIcon,
+  license: FileKeyIcon,
+  profile: UsersIcon,
+  missing_site: BoxIcon,
+  inactive_person: UserRoundXIcon,
+};
+
+export function DashboardAttentionPanel({
+  companyId,
+  onDetails,
+}: {
+  companyId: string | undefined;
+  onDetails: (issue: DashboardIssue) => void;
+}) {
+  const { t } = useTranslation("companies");
+  const attention = useQuery({
+    queryKey: dashboardKeys.block("attention", companyId),
+    queryFn: ({ signal }) => dashboardApi.attention(signal, companyId),
+    staleTime: 0,
+  });
+
+  return (
+    <DashboardPanel
+      icon={<TriangleAlertIcon className="text-destructive" />}
+      title={t("dashboard.attention")}
+    >
+      <BlockState
+        empty={!attention.data?.items.length}
+        emptyText={t("dashboard.noAttention")}
+        query={attention}
+      >
+        <ul className="divide-y">
+          {attention.data?.items.map((item) => {
+            const Icon = ISSUE_ICONS[item.kind];
+            return (
+              <li key={item.kind}>
+                <button
+                  className="dashboard-alert"
+                  onClick={() => onDetails(item.kind)}
+                  type="button"
+                >
+                  <Icon aria-hidden="true" className="size-5" />
+                  <strong
+                    className={
+                      item.count ? "text-amber-600 dark:text-amber-400" : "text-muted-foreground"
+                    }
+                  >
+                    {item.count}
+                  </strong>
+                  <span>{t(`dashboard.issues.${item.kind}`)}</span>
+                  <ChevronRightIcon aria-hidden="true" className="size-4 shrink-0" />
+                </button>
+              </li>
+            );
+          })}
+        </ul>
+      </BlockState>
+    </DashboardPanel>
+  );
+}
diff --git a/modules/companies/src/web/components/dashboard-companies-panel.tsx b/modules/companies/src/web/components/dashboard-companies-panel.tsx
new file mode 100644
index 0000000..42b080c
--- /dev/null
+++ b/modules/companies/src/web/components/dashboard-companies-panel.tsx
@@ -0,0 +1,128 @@
+import { Building2Icon } from "@repo/shadcn-ui/lib/icons";
+import { useQuery } from "@tanstack/react-query";
+import { useTranslation } from "react-i18next";
+
+import type { DashboardNavigation } from "./dashboard-api";
+import { dashboardApi, dashboardKeys } from "./dashboard-api";
+import { BlockState } from "./dashboard-block";
+import { DashboardPanel } from "./dashboard-panel";
+export function DashboardCompaniesPanel({
+  companyId,
+  onDetails,
+  onNavigate,
+}: {
+  companyId: string | undefined;
+  onDetails: () => void;
+  onNavigate: (destination: DashboardNavigation) => void;
+}) {
+  const { t } = useTranslation("companies");
+  const totals = useQuery({
+    queryKey: dashboardKeys.block("companies", companyId),
+    queryFn: ({ signal }) => dashboardApi.companies(signal, companyId),
+    staleTime: 0,
+  });
+
+  return (
+    <DashboardPanel
+      action={onDetails}
+      icon={<Building2Icon />}
+      title={t("dashboard.companySummary")}
+    >
+      <BlockState empty={!totals.data?.items.length} emptyText={t("noCompanies")} query={totals}>
+        <div className="overflow-x-auto">
+          <table>
+            <caption className="sr-only">{t("dashboard.companySummary")}</caption>
+            <thead>
+              <tr>
+                {[
+                  t("tickets.company"),
+                  t("dashboard.openTickets"),
+                  t("dashboard.pendingInterventions"),
+                  t("dashboard.registeredAssets"),
+                  t("people"),
+                ].map((label) => (
+                  <th key={label} scope="col">
+                    {label}
+                  </th>
+                ))}
+              </tr>
+            </thead>
+            <tbody>
+              {totals.data?.items.slice(0, 5).map((item) => (
+                <tr key={item.id}>
+                  <td>
+                    <button
+                      className="dashboard-link"
+                      onClick={() =>
+                        onNavigate({ area: "company", id: item.id, section: "inventory" })
+                      }
+                      type="button"
+                    >
+                      {item.name}
+                    </button>
+                  </td>
+                  <td>
+                    <button
+                      aria-label={`${t("dashboard.openTickets")} · ${item.name}: ${item.tickets}`}
+                      className="dashboard-link text-destructive"
+                      onClick={() =>
+                        onNavigate({ area: "tickets", companyId: item.id, pendingOnly: true })
+                      }
+                      type="button"
+                    >
+                      {item.tickets}
+                    </button>
+                  </td>
+                  <td>
+                    <button
+                      aria-label={`${t("dashboard.pendingInterventions")} · ${item.name}: ${item.interventions}`}
+                      className="dashboard-link text-amber-600 dark:text-amber-400"
+                      onClick={() =>
+                        onNavigate({
+                          area: "interventions",
+                          companyId: item.id,
+                          pendingOnly: true,
+                        })
+                      }
+                      type="button"
+                    >
+                      {item.interventions}
+                    </button>
+                  </td>
+                  <td>
+                    <button
+                      className="dashboard-link"
+                      onClick={() =>
+                        onNavigate({ area: "company", id: item.id, section: "inventory" })
+                      }
+                      type="button"
+                    >
+                      <span className="sr-only">
+                        {t("dashboard.registeredAssets")} · {item.name}:{" "}
+                      </span>
+                      {item.assets}
+                    </button>
+                  </td>
+                  <td>
+                    <button
+                      className="dashboard-link"
+                      onClick={() =>
+                        onNavigate({ area: "company", id: item.id, section: "people" })
+                      }
+                      type="button"
+                    >
+                      <span className="sr-only">
+                        {t("people")} · {item.name}:{" "}
+                      </span>
+                      {item.people}
+                    </button>
+                  </td>
+                </tr>
+              ))}
+            </tbody>
+          </table>
+        </div>
+      </BlockState>
+    </DashboardPanel>
+  );
+}
diff --git a/modules/companies/src/web/components/dashboard-details-dialog.tsx b/modules/companies/src/web/components/dashboard-details-dialog.tsx
index b6bbd39..ccb905b 100644
--- a/modules/companies/src/web/components/dashboard-details-dialog.tsx
+++ b/modules/companies/src/web/components/dashboard-details-dialog.tsx
@@ -8,12 +8,8 @@ import { useTranslation } from "react-i18next";
 
 import type { DashboardIssue } from "../../common/dashboard";
 
-import {
-  type DashboardNavigation,
-  dashboardApi,
-  dashboardKeys,
-  entryDestination,
-} from "./dashboard-api";
+import type { DashboardNavigation } from "./dashboard-api";
+import { dashboardApi, dashboardKeys, entryDestination } from "./dashboard-api";
 import { BlockState } from "./dashboard-block";
 
 export function DashboardDetailsDialog({
diff --git a/modules/companies/src/web/components/dashboard-kind-icons.ts b/modules/companies/src/web/components/dashboard-kind-icons.ts
new file mode 100644
index 0000000..fb65a05
--- /dev/null
+++ b/modules/companies/src/web/components/dashboard-kind-icons.ts
@@ -0,0 +1,15 @@
+import {
+  DatabaseIcon,
+  LaptopIcon,
+  TicketIcon,
+  UsersIcon,
+  WrenchIcon,
+} from "@repo/shadcn-ui/lib/icons";
+export const KIND_ICONS = {
+  ticket: TicketIcon,
+  intervention: WrenchIcon,
+  asset: LaptopIcon,
+  resource: DatabaseIcon,
+  person: UsersIcon,
+  profile: UsersIcon,
+};
diff --git a/modules/companies/src/web/components/dashboard-page.tsx b/modules/companies/src/web/components/dashboard-page.tsx
index c7cb39a..4c92277 100644
--- a/modules/companies/src/web/components/dashboard-page.tsx
+++ b/modules/companies/src/web/components/dashboard-page.tsx
@@ -1,54 +1,24 @@
 import { Button } from "@repo/shadcn-ui/components/button";
 import { SelectWithAction } from "@repo/shadcn-ui/components/select-with-action";
-import { StatisticCard } from "@repo/shadcn-ui/components/statistic-card";
-import {
-  BoxIcon,
-  Building2Icon,
-  ChevronRightIcon,
-  ClockIcon,
-  DatabaseIcon,
-  FileKeyIcon,
-  LaptopIcon,
-  TicketIcon,
-  TriangleAlertIcon,
-  UserRoundXIcon,
-  UsersIcon,
-  WrenchIcon,
-} from "@repo/shadcn-ui/lib/icons";
+import { Building2Icon } from "@repo/shadcn-ui/lib/icons";
 import { useQuery } from "@tanstack/react-query";
+import type { ComponentProps } from "react";
 import { useState } from "react";
 import { useTranslation } from "react-i18next";
 
-import type { DashboardIssue } from "../../common/dashboard";
 import { companyApi, companyKeys } from "../api/company-api";
 
-import {
-  type DashboardNavigation,
-  dashboardApi,
-  dashboardKeys,
-  entryDestination,
-} from "./dashboard-api";
-import { BlockState } from "./dashboard-block";
+import { DashboardActivityPanel } from "./dashboard-activity-panel";
+import type { DashboardNavigation } from "./dashboard-api";
+import { dashboardApi, dashboardKeys } from "./dashboard-api";
+import { DashboardAttentionPanel } from "./dashboard-attention-panel";
+import { DashboardCompaniesPanel } from "./dashboard-companies-panel";
 import { DashboardDetailsDialog } from "./dashboard-details-dialog";
+import { KIND_ICONS } from "./dashboard-kind-icons";
 import { DashboardPanel } from "./dashboard-panel";
 import { DashboardQuickCreate } from "./dashboard-quick-create";
-
-const ISSUE_ICONS = {
-  certificate: FileKeyIcon,
-  license: FileKeyIcon,
-  profile: UsersIcon,
-  missing_site: BoxIcon,
-  inactive_person: UserRoundXIcon,
-};
-
-const KIND_ICONS = {
-  ticket: TicketIcon,
-  intervention: WrenchIcon,
-  asset: LaptopIcon,
-  resource: DatabaseIcon,
-  person: UsersIcon,
-  profile: UsersIcon,
-};
+import { DashboardStatistics } from "./dashboard-statistics";
+import { DashboardWorkPanel } from "./dashboard-work-panel";
 
 export function DashboardPage({
   onNavigate,
@@ -57,93 +27,19 @@ export function DashboardPage({
   onNavigate: (destination: DashboardNavigation) => void;
   csrfToken: string;
 }) {
-  const { t, i18n } = useTranslation("companies");
+  const { t } = useTranslation("companies");
   const [companyId, setCompanyId] = useState("");
   const scope = companyId || undefined;
-  const [details, setDetails] = useState<{
-    kind?: "asset" | "resource";
-    issue?: DashboardIssue;
-    work?: boolean;
-    activity?: boolean;
-    companies?: boolean;
-  }>();
-  const [quick, setQuick] = useState<
-    "company" | "ticket" | "intervention" | "asset" | "resource"
-  >();
+  const [details, setDetails] =
+    useState<ComponentProps<typeof DashboardDetailsDialog>["details"]>();
+  const [quick, setQuick] = useState<ComponentProps<typeof DashboardQuickCreate>["kind"]>();
   const companies = useQuery({ queryKey: companyKeys.list, queryFn: companyApi.list });
   const summary = useQuery({
     queryKey: dashboardKeys.block("summary", scope),
     queryFn: ({ signal }) => dashboardApi.summary(signal, scope),
     staleTime: 0,
   });
-  const work = useQuery({
-    queryKey: dashboardKeys.block("work", scope),
-    queryFn: ({ signal }) => dashboardApi.work(signal, scope),
-    staleTime: 0,
-  });
-  const attention = useQuery({
-    queryKey: dashboardKeys.block("attention", scope),
-    queryFn: ({ signal }) => dashboardApi.attention(signal, scope),
-    staleTime: 0,
-  });
-  const activity = useQuery({
-    queryKey: dashboardKeys.block("activity", scope),
-    queryFn: ({ signal }) => dashboardApi.activity(signal, scope),
-    staleTime: 0,
-  });
-  const totals = useQuery({
-    queryKey: dashboardKeys.block("companies", scope),
-    queryFn: ({ signal }) => dashboardApi.companies(signal, scope),
-    staleTime: 0,
-  });
-  const date = (value: string | null) =>
-    value
-      ? new Intl.DateTimeFormat(i18n.language, { dateStyle: "medium", timeStyle: "short" }).format(
-          new Date(value)
-        )
-      : "—";
-  const statStatus = summary.isPending
-    ? t("loading")
-    : summary.isError
-      ? t("dashboard.blockError")
-      : undefined;
-  const kpis = [
-    {
-      key: "companies",
-      label: "activeCompanies",
-      Icon: Building2Icon,
-      tone: "teal",
-      action: () => onNavigate({ area: "directory", companyId: scope, activeOnly: true }),
-    },
-    {
-      key: "tickets",
-      label: "openTickets",
-      Icon: TicketIcon,
-      tone: "rose",
-      action: () => onNavigate({ area: "tickets", companyId: scope, pendingOnly: true }),
-    },
-    {
-      key: "interventions",
-      label: "pendingInterventions",
-      Icon: WrenchIcon,
-      tone: "amber",
-      action: () => onNavigate({ area: "interventions", companyId: scope, pendingOnly: true }),
-    },
-    {
-      key: "assets",
-      label: "registeredAssets",
-      Icon: LaptopIcon,
-      tone: "green",
-      action: () => setDetails({ kind: "asset" }),
-    },
-    {
-      key: "resources",
-      label: "registeredResources",
-      Icon: DatabaseIcon,
-      tone: "violet",
-      action: () => setDetails({ kind: "resource" }),
-    },
-  ] as const;
+
   return (
     <div className="dashboard-page space-y-6">
       <header className="flex flex-wrap items-start justify-between gap-4">
@@ -171,281 +67,31 @@ export function DashboardPage({
           )}
         </div>
       </header>
-      <section aria-label={t("dashboard.indicators")} className="dashboard-kpis">
-        {kpis.map(({ key, label, Icon, tone, action }) => (
-          <StatisticCard
-            icon={<Icon />}
-            key={key}
-            label={t(`dashboard.${label}`)}
-            onClick={action}
-            status={statStatus}
-            tone={tone}
-            value={summary.isError ? undefined : summary.data?.[key]}
-          />
-        ))}
-      </section>
+      <DashboardStatistics
+        onDetails={(kind) => setDetails({ kind })}
+        onNavigate={onNavigate}
+        scope={scope}
+        summary={summary}
+      />
       <div className="grid gap-6 xl:grid-cols-[minmax(0,1.5fr)_minmax(0,1fr)]">
-        <DashboardPanel
-          action={() => setDetails({ work: true })}
-          icon={<TicketIcon />}
-          title={t("dashboard.pendingWork")}
-        >
-          <BlockState
-            empty={!work.data?.items.length}
-            emptyText={t("dashboard.noPendingWork")}
-            query={work}
-          >
-            <div className="overflow-x-auto">
-              <table>
-                <caption className="sr-only">{t("dashboard.pendingWork")}</caption>
-                <thead>
-                  <tr>
-                    {[
-                      t("dashboard.type"),
-                      t("tickets.reference"),
-                      t("tickets.subject"),
-                      t("tickets.company"),
-                      t("tickets.priority"),
-                      t("tickets.state"),
-                    ].map((label) => (
-                      <th key={label} scope="col">
-                        {label}
-                      </th>
-                    ))}
-                  </tr>
-                </thead>
-                <tbody>
-                  {work.data?.items.slice(0, 6).map((item) => {
-                    const Icon = KIND_ICONS[item.kind];
-                    return (
-                      <tr key={item.id}>
-                        <td>
-                          <Icon aria-hidden="true" className="size-5 text-primary" />
-                          <span className="sr-only">{t(`dashboard.types.${item.kind}`)}</span>
-                        </td>
-                        <td>
-                          <button
-                            className="dashboard-link"
-                            onClick={() => onNavigate(entryDestination(item))}
-                            type="button"
-                          >
-                            {item.reference}
-                          </button>
-                        </td>
-                        <td>{item.name}</td>
-                        <td>{item.companyName}</td>
-                        <td>
-                          {item.priority ? (
-                            <span className="dashboard-badge" data-state={item.priority}>
-                              {t(`tickets.priorities.${item.priority}`)}
-                            </span>
-                          ) : (
-                            "—"
-                          )}
-                        </td>
-                        <td>
-                          <span className="dashboard-badge" data-state={item.state}>
-                            {t(
-                              (item.kind === "ticket"
-                                ? "tickets.states."
-                                : "interventions.states.") + item.state
-                            )}
-                          </span>
-                        </td>
-                      </tr>
-                    );
-                  })}
-                </tbody>
-              </table>
-            </div>
-          </BlockState>
-        </DashboardPanel>
-        <DashboardPanel
-          icon={<TriangleAlertIcon className="text-destructive" />}
-          title={t("dashboard.attention")}
-        >
-          <BlockState
-            empty={!attention.data?.items.length}
-            emptyText={t("dashboard.noAttention")}
-            query={attention}
-          >
-            <ul className="divide-y">
-              {attention.data?.items.map((item) => {
-                const Icon = ISSUE_ICONS[item.kind];
-                return (
-                  <li key={item.kind}>
-                    <button
-                      className="dashboard-alert"
-                      onClick={() => setDetails({ issue: item.kind })}
-                      type="button"
-                    >
-                      <Icon aria-hidden="true" className="size-5" />
-                      <strong
-                        className={
-                          item.count
-                            ? "text-amber-600 dark:text-amber-400"
-                            : "text-muted-foreground"
-                        }
-                      >
-                        {item.count}
-                      </strong>
-                      <span>{t(`dashboard.issues.${item.kind}`)}</span>
-                      <ChevronRightIcon aria-hidden="true" className="size-4 shrink-0" />
-                    </button>
-                  </li>
-                );
-              })}
-            </ul>
-          </BlockState>
-        </DashboardPanel>
+        <DashboardWorkPanel
+          companyId={scope}
+          onDetails={() => setDetails({ work: true })}
+          onNavigate={onNavigate}
+        />
+        <DashboardAttentionPanel companyId={scope} onDetails={(issue) => setDetails({ issue })} />
       </div>
       <div className="grid gap-6 xl:grid-cols-2">
-        <DashboardPanel
-          action={() => setDetails({ activity: true })}
-          icon={<ClockIcon />}
-          title={t("dashboard.recentActivity")}
-        >
-          <BlockState
-            empty={!activity.data?.items.length}
-            emptyText={t("dashboard.noRecentActivity")}
-            query={activity}
-          >
-            <ol className="dashboard-timeline">
-              {activity.data?.items.slice(0, 4).map((item) => {
-                const Icon = KIND_ICONS[item.kind];
-                return (
-                  <li key={item.eventId ?? item.id}>
-                    <time
-                      className="text-xs text-muted-foreground"
-                      dateTime={item.recordedAt ?? undefined}
-                    >
-                      {date(item.recordedAt)}
-                    </time>
-                    <Icon aria-hidden="true" className="size-5 text-primary shrink-0" />
-                    <div>
-                      <button
-                        className="dashboard-link"
-                        onClick={() => onNavigate(entryDestination(item))}
-                        type="button"
-                      >
-                        {t("dashboard.recordUpdated", { name: item.reference ?? item.name })}
-                      </button>
-                      <p className="text-xs text-muted-foreground">
-                        {item.companyName}
-                        {item.actorName ? ` · ${item.actorName}` : ""}
-                      </p>
-                    </div>
-                  </li>
-                );
-              })}
-            </ol>
-          </BlockState>
-        </DashboardPanel>
-        <DashboardPanel
-          action={() => setDetails({ companies: true })}
-          icon={<Building2Icon />}
-          title={t("dashboard.companySummary")}
-        >
-          <BlockState
-            empty={!totals.data?.items.length}
-            emptyText={t("noCompanies")}
-            query={totals}
-          >
-            <div className="overflow-x-auto">
-              <table>
-                <caption className="sr-only">{t("dashboard.companySummary")}</caption>
-                <thead>
-                  <tr>
-                    {[
-                      t("tickets.company"),
-                      t("dashboard.openTickets"),
-                      t("dashboard.pendingInterventions"),
-                      t("dashboard.registeredAssets"),
-                      t("people"),
-                    ].map((label) => (
-                      <th key={label} scope="col">
-                        {label}
-                      </th>
-                    ))}
-                  </tr>
-                </thead>
-                <tbody>
-                  {totals.data?.items.slice(0, 5).map((item) => (
-                    <tr key={item.id}>
-                      <td>
-                        <button
-                          className="dashboard-link"
-                          onClick={() =>
-                            onNavigate({ area: "company", id: item.id, section: "inventory" })
-                          }
-                          type="button"
-                        >
-                          {item.name}
-                        </button>
-                      </td>
-                      <td>
-                        <button
-                          aria-label={`${t("dashboard.openTickets")} · ${item.name}: ${item.tickets}`}
-                          className="dashboard-link text-destructive"
-                          onClick={() =>
-                            onNavigate({ area: "tickets", companyId: item.id, pendingOnly: true })
-                          }
-                          type="button"
-                        >
-                          {item.tickets}
-                        </button>
-                      </td>
-                      <td>
-                        <button
-                          aria-label={`${t("dashboard.pendingInterventions")} · ${item.name}: ${item.interventions}`}
-                          className="dashboard-link text-amber-600 dark:text-amber-400"
-                          onClick={() =>
-                            onNavigate({
-                              area: "interventions",
-                              companyId: item.id,
-                              pendingOnly: true,
-                            })
-                          }
-                          type="button"
-                        >
-                          {item.interventions}
-                        </button>
-                      </td>
-                      <td>
-                        <button
-                          className="dashboard-link"
-                          onClick={() =>
-                            onNavigate({ area: "company", id: item.id, section: "inventory" })
-                          }
-                          type="button"
-                        >
-                          <span className="sr-only">
-                            {t("dashboard.registeredAssets")} · {item.name}:{" "}
-                          </span>
-                          {item.assets}
-                        </button>
-                      </td>
-                      <td>
-                        <button
-                          className="dashboard-link"
-                          onClick={() =>
-                            onNavigate({ area: "company", id: item.id, section: "people" })
-                          }
-                          type="button"
-                        >
-                          <span className="sr-only">
-                            {t("people")} · {item.name}:{" "}
-                          </span>
-                          {item.people}
-                        </button>
-                      </td>
-                    </tr>
-                  ))}
-                </tbody>
-              </table>
-            </div>
-          </BlockState>
-        </DashboardPanel>
+        <DashboardActivityPanel
+          companyId={scope}
+          onDetails={() => setDetails({ activity: true })}
+          onNavigate={onNavigate}
+        />
+        <DashboardCompaniesPanel
+          companyId={scope}
+          onDetails={() => setDetails({ companies: true })}
+          onNavigate={onNavigate}
+        />
       </div>
       <DashboardPanel title={t("dashboard.quickActions")}>
         <div className="flex flex-wrap gap-3">
diff --git a/modules/companies/src/web/components/dashboard-quick-create.tsx b/modules/companies/src/web/components/dashboard-quick-create.tsx
index a835aae..c492280 100644
--- a/modules/companies/src/web/components/dashboard-quick-create.tsx
+++ b/modules/companies/src/web/components/dashboard-quick-create.tsx
@@ -11,6 +11,7 @@ import { InterventionForm } from "../interventions/intervention-form";
 import { ticketApi, ticketKeys } from "../tickets/ticket-api";
 import { TicketForm } from "../tickets/ticket-form";
 
+import { CompanyEditorDialog } from "./company-editor-dialog";
 import { CompanyForm } from "./company-form";
 import type { DashboardNavigation } from "./dashboard-api";
 import { BlockState } from "./dashboard-block";
@@ -121,22 +122,15 @@ export function DashboardQuickCreate({
         )}
       </FormDialog>
       {addingCompany && (
-        <FormDialog
-          cancelLabel={t("cancel")}
-          formActions
+        <CompanyEditorDialog
+          csrfToken={csrfToken}
+          onCreated={(id) => {
+            setSelectedCompany(id);
+            setAddingCompany(false);
+          }}
           onOpenChange={setAddingCompany}
           open
-          title={t("newCompany")}
-        >
-          <CompanyForm
-            csrfToken={csrfToken}
-            onCreated={(id) => {
-              setSelectedCompany(id);
-              setAddingCompany(false);
-            }}
-            showTitle={false}
-          />
-        </FormDialog>
+        />
       )}
     </>
   );
diff --git a/modules/companies/src/web/components/dashboard-statistics.tsx b/modules/companies/src/web/components/dashboard-statistics.tsx
new file mode 100644
index 0000000..d497939
--- /dev/null
+++ b/modules/companies/src/web/components/dashboard-statistics.tsx
@@ -0,0 +1,84 @@
+import { StatisticCard } from "@repo/shadcn-ui/components/statistic-card";
+import {
+  Building2Icon,
+  DatabaseIcon,
+  LaptopIcon,
+  TicketIcon,
+  WrenchIcon,
+} from "@repo/shadcn-ui/lib/icons";
+import type { UseQueryResult } from "@tanstack/react-query";
+import { useTranslation } from "react-i18next";
+
+import type { DashboardSummaryDTO } from "../../common/dashboard";
+
+import type { DashboardNavigation } from "./dashboard-api";
+export function DashboardStatistics({
+  scope,
+  summary,
+  onNavigate,
+  onDetails,
+}: {
+  scope: string | undefined;
+  summary: UseQueryResult<DashboardSummaryDTO>;
+  onNavigate: (destination: DashboardNavigation) => void;
+  onDetails: (kind: "asset" | "resource") => void;
+}) {
+  const { t } = useTranslation("companies");
+  const statStatus = summary.isPending
+    ? t("loading")
+    : summary.isError
+      ? t("dashboard.blockError")
+      : undefined;
+  const kpis = [
+    {
+      key: "companies",
+      label: "activeCompanies",
+      Icon: Building2Icon,
+      tone: "teal",
+      action: () => onNavigate({ area: "directory", companyId: scope, activeOnly: true }),
+    },
+    {
+      key: "tickets",
+      label: "openTickets",
+      Icon: TicketIcon,
+      tone: "rose",
+      action: () => onNavigate({ area: "tickets", companyId: scope, pendingOnly: true }),
+    },
+    {
+      key: "interventions",
+      label: "pendingInterventions",
+      Icon: WrenchIcon,
+      tone: "amber",
+      action: () => onNavigate({ area: "interventions", companyId: scope, pendingOnly: true }),
+    },
+    {
+      key: "assets",
+      label: "registeredAssets",
+      Icon: LaptopIcon,
+      tone: "green",
+      action: () => onDetails("asset"),
+    },
+    {
+      key: "resources",
+      label: "registeredResources",
+      Icon: DatabaseIcon,
+      tone: "violet",
+      action: () => onDetails("resource"),
+    },
+  ] as const;
+  return (
+    <section aria-label={t("dashboard.indicators")} className="dashboard-kpis">
+      {kpis.map(({ key, label, Icon, tone, action }) => (
+        <StatisticCard
+          icon={<Icon />}
+          key={key}
+          label={t(`dashboard.${label}`)}
+          onClick={action}
+          status={statStatus}
+          tone={tone}
+          value={summary.isError ? undefined : summary.data?.[key]}
+        />
+      ))}
+    </section>
+  );
+}
diff --git a/modules/companies/src/web/components/dashboard-work-panel.tsx b/modules/companies/src/web/components/dashboard-work-panel.tsx
new file mode 100644
index 0000000..94917d1
--- /dev/null
+++ b/modules/companies/src/web/components/dashboard-work-panel.tsx
@@ -0,0 +1,98 @@
+import { TicketIcon } from "@repo/shadcn-ui/lib/icons";
+import { useQuery } from "@tanstack/react-query";
+import { useTranslation } from "react-i18next";
+
+import type { DashboardNavigation } from "./dashboard-api";
+import { dashboardApi, dashboardKeys, entryDestination } from "./dashboard-api";
+import { BlockState } from "./dashboard-block";
+import { KIND_ICONS } from "./dashboard-kind-icons";
+import { DashboardPanel } from "./dashboard-panel";
+export function DashboardWorkPanel({
+  companyId,
+  onDetails,
+  onNavigate,
+}: {
+  companyId: string | undefined;
+  onDetails: () => void;
+  onNavigate: (destination: DashboardNavigation) => void;
+}) {
+  const { t } = useTranslation("companies");
+  const work = useQuery({
+    queryKey: dashboardKeys.block("work", companyId),
+    queryFn: ({ signal }) => dashboardApi.work(signal, companyId),
+    staleTime: 0,
+  });
+
+  return (
+    <DashboardPanel action={onDetails} icon={<TicketIcon />} title={t("dashboard.pendingWork")}>
+      <BlockState
+        empty={!work.data?.items.length}
+        emptyText={t("dashboard.noPendingWork")}
+        query={work}
+      >
+        <div className="overflow-x-auto">
+          <table>
+            <caption className="sr-only">{t("dashboard.pendingWork")}</caption>
+            <thead>
+              <tr>
+                {[
+                  t("dashboard.type"),
+                  t("tickets.reference"),
+                  t("tickets.subject"),
+                  t("tickets.company"),
+                  t("tickets.priority"),
+                  t("tickets.state"),
+                ].map((label) => (
+                  <th key={label} scope="col">
+                    {label}
+                  </th>
+                ))}
+              </tr>
+            </thead>
+            <tbody>
+              {work.data?.items.slice(0, 6).map((item) => {
+                const Icon = KIND_ICONS[item.kind];
+                return (
+                  <tr key={item.id}>
+                    <td>
+                      <Icon aria-hidden="true" className="size-5 text-primary" />
+                      <span className="sr-only">{t(`dashboard.types.${item.kind}`)}</span>
+                    </td>
+                    <td>
+                      <button
+                        className="dashboard-link"
+                        onClick={() => onNavigate(entryDestination(item))}
+                        type="button"
+                      >
+                        {item.reference}
+                      </button>
+                    </td>
+                    <td>{item.name}</td>
+                    <td>{item.companyName}</td>
+                    <td>
+                      {item.priority ? (
+                        <span className="dashboard-badge" data-state={item.priority}>
+                          {t(`tickets.priorities.${item.priority}`)}
+                        </span>
+                      ) : (
+                        "—"
+                      )}
+                    </td>
+                    <td>
+                      <span className="dashboard-badge" data-state={item.state}>
+                        {t(
+                          (item.kind === "ticket" ? "tickets.states." : "interventions.states.") +
+                            item.state
+                        )}
+                      </span>
+                    </td>
+                  </tr>
+                );
+              })}
+            </tbody>
+          </table>
+        </div>
+      </BlockState>
+    </DashboardPanel>
+  );
+}
diff --git a/modules/companies/src/web/components/department-editor-dialog.tsx b/modules/companies/src/web/components/department-editor-dialog.tsx
new file mode 100644
index 0000000..90029cf
--- /dev/null
+++ b/modules/companies/src/web/components/department-editor-dialog.tsx
@@ -0,0 +1,27 @@
+import { FormDialog } from "@repo/shadcn-ui/components/form-dialog";
+import type { ComponentProps } from "react";
+import { useTranslation } from "react-i18next";
+
+import { DepartmentForm } from "./department-form";
+
+export function DepartmentEditorDialog({
+  open,
+  onOpenChange,
+  ...formProps
+}: ComponentProps<typeof DepartmentForm> & {
+  open: boolean;
+  onOpenChange: (open: boolean) => void;
+}) {
+  const { t } = useTranslation("companies");
+  return (
+    <FormDialog
+      cancelLabel={t("cancel")}
+      formActions
+      onOpenChange={onOpenChange}
+      open={open}
+      title={t(formProps.department ? "editDepartment" : "newDepartment")}
+    >
+      <DepartmentForm {...formProps} key={formProps.department?.id ?? "new"} />
+    </FormDialog>
+  );
+}
diff --git a/modules/companies/src/web/components/department-section.tsx b/modules/companies/src/web/components/department-section.tsx
index b43790b..a2c208e 100644
--- a/modules/companies/src/web/components/department-section.tsx
+++ b/modules/companies/src/web/components/department-section.tsx
@@ -6,13 +6,12 @@ import {
   EntityStatus,
   EntityTable,
 } from "@repo/shadcn-ui/components/entity-list";
-import { FormDialog } from "@repo/shadcn-ui/components/form-dialog";
 import { useState } from "react";
 import { useTranslation } from "react-i18next";
 
 import type { CompanyDTO } from "../../common";
 
-import { DepartmentForm } from "./department-form";
+import { DepartmentEditorDialog } from "./department-editor-dialog";
 
 export function DepartmentSection({
   company,
@@ -84,25 +83,18 @@ export function DepartmentSection({
         locale={i18n.language}
         title={t("departments")}
       />
-      <FormDialog
-        cancelLabel={t("cancel")}
-        formActions
+      <DepartmentEditorDialog
+        companyId={company.id}
+        csrfToken={csrfToken}
+        department={selected}
         onOpenChange={(open) => {
           if (!open) {
             setEditor(undefined);
           }
         }}
+        onSaved={() => setEditor(undefined)}
         open={editor !== undefined}
-        title={t(selected ? "editDepartment" : "newDepartment")}
-      >
-        <DepartmentForm
-          companyId={company.id}
-          csrfToken={csrfToken}
-          department={selected}
-          key={editor}
-          onSaved={() => setEditor(undefined)}
-        />
-      </FormDialog>
+      />
     </div>
   );
 }
diff --git a/modules/companies/src/web/components/inventory-quick-create-dialog.tsx b/modules/companies/src/web/components/inventory-quick-create-dialog.tsx
new file mode 100644
index 0000000..7d6884f
--- /dev/null
+++ b/modules/companies/src/web/components/inventory-quick-create-dialog.tsx
@@ -0,0 +1,58 @@
+import { FormDialog } from "@repo/shadcn-ui/components/form-dialog";
+import { useTranslation } from "react-i18next";
+
+import { PersonForm } from "./person-form";
+import { SiteForm } from "./site-form";
+
+export function InventoryQuickCreateDialog({
+  companyId,
+  csrfToken,
+  kind,
+  onCreated,
+  onClose,
+}: {
+  companyId: string;
+  csrfToken: string;
+  kind: "site" | "person";
+  onCreated: (id: string) => void;
+  onClose: () => void;
+}) {
+  const { t } = useTranslation("companies");
+  const { t: assetTranslation } = useTranslation("assets");
+  return (
+    <FormDialog
+      cancelLabel={t("cancel")}
+      formActions
+      onOpenChange={(open) => {
+        if (!open) {
+          onClose();
+        }
+      }}
+      open
+      title={t(kind === "site" ? "newSite" : "newPerson")}
+    >
+      <p className="text-sm text-muted-foreground">{assetTranslation("relatedNotice")}</p>
+      {kind === "site" ? (
+        <SiteForm
+          companyId={companyId}
+          csrfToken={csrfToken}
+          onSaved={(id) => {
+            onCreated(id);
+            onClose();
+          }}
+          showTitle={false}
+        />
+      ) : (
+        <PersonForm
+          companyId={companyId}
+          csrfToken={csrfToken}
+          onSaved={(id) => {
+            onCreated(id);
+            onClose();
+          }}
+          requireActive
+        />
+      )}
+    </FormDialog>
+  );
+}
diff --git a/modules/companies/src/web/components/people-section.tsx b/modules/companies/src/web/components/people-section.tsx
index 03193f6..e3e0f1b 100644
--- a/modules/companies/src/web/components/people-section.tsx
+++ b/modules/companies/src/web/components/people-section.tsx
@@ -7,7 +7,6 @@ import {
   EntityStatus,
   EntityTable,
 } from "@repo/shadcn-ui/components/entity-list";
-import { FormDialog } from "@repo/shadcn-ui/components/form-dialog";
 import { Label } from "@repo/shadcn-ui/components/label";
 import { useId, useState } from "react";
 import { useTranslation } from "react-i18next";
@@ -15,7 +14,7 @@ import { useTranslation } from "react-i18next";
 import type { CompanyDTO } from "../../common";
 
 import { PersonDetails } from "./person-details";
-import { PersonForm } from "./person-form";
+import { PersonEditorDialog } from "./person-editor-dialog";
 
 export function PeopleSection({
   company,
@@ -35,26 +34,18 @@ export function PeopleSection({
   const [contactsOnly, setContactsOnly] = useState(false);
   const selected = company.people.find((item) => item.id === selection?.id);
   const personEditor = (
-    <FormDialog
-      cancelLabel={t("cancel")}
-      formActions
+    <PersonEditorDialog
+      companyId={company.id}
+      csrfToken={csrfToken}
       onOpenChange={(open) => {
         if (!open) {
           setSelection(selected ? { mode: "detail", id: selected.id } : undefined);
         }
       }}
+      onSaved={(id) => setSelection({ mode: "detail", id })}
       open={selection?.mode === "new" || selection?.mode === "edit"}
-      title={t(selected ? "editPerson" : "newPerson")}
-      wide
-    >
-      <PersonForm
-        companyId={company.id}
-        csrfToken={csrfToken}
-        key={selected?.id ?? "new"}
-        onSaved={(id) => setSelection({ mode: "detail", id })}
-        person={selected}
-      />
-    </FormDialog>
+      person={selected}
+    />
   );
   if (selected) {
     return (
diff --git a/modules/companies/src/web/components/person-details.tsx b/modules/companies/src/web/components/person-details.tsx
index 1a02411..417a96d 100644
--- a/modules/companies/src/web/components/person-details.tsx
+++ b/modules/companies/src/web/components/person-details.tsx
@@ -6,13 +6,13 @@ import {
   EntityRowActions,
   EntityTable,
 } from "@repo/shadcn-ui/components/entity-list";
-import { FormDialog } from "@repo/shadcn-ui/components/form-dialog";
 import { useState } from "react";
 import { useTranslation } from "react-i18next";
 
 import type { CompanyDTO, PersonDTO } from "../../common";
 
-import { AssignmentForm } from "./assignment-form";
+import { AssignmentEditorDialog } from "./assignment-editor-dialog";
+import { AssignmentHistoryDialog } from "./assignment-history-dialog";
 
 export function PersonDetails({
   company,
@@ -148,58 +148,28 @@ export function PersonDetails({
           )}
         </CardContent>
       </Card>
-      <FormDialog
-        cancelLabel={t("cancel")}
-        formActions
+      <AssignmentEditorDialog
+        company={company}
+        csrfToken={csrfToken}
+        editor={editor}
         onOpenChange={(open) => {
           if (!open) {
             setEditor(undefined);
           }
         }}
-        open={editor !== undefined}
-        title={t(selected ? "editAssignment" : "addAssignment")}
-      >
-        <AssignmentForm
-          assignment={selected}
-          company={company}
-          csrfToken={csrfToken}
-          key={editor}
-          onSaved={() => setEditor(undefined)}
-          personId={person.id}
-        />
-      </FormDialog>
-      <FormDialog
-        cancelLabel={t("close")}
+        onSaved={() => setEditor(undefined)}
+        personId={person.id}
+        selected={selected}
+      />
+      <AssignmentHistoryDialog
+        departmentName={departmentName}
+        history={history}
         onOpenChange={(open) => {
           if (!open) {
             setHistoryId(undefined);
           }
         }}
-        open={history !== undefined}
-        title={t("assignmentHistory")}
-      >
-        {history && (
-          <div className="space-y-4">
-            <p>{departmentName(history.departmentId)}</p>
-            {[...history.history].reverse().map((revision) => (
-              <div className="space-y-1 rounded-md border p-3" key={revision.id}>
-                <p className="text-sm font-medium">
-                  {new Date(revision.recordedAt).toLocaleString(i18n.language)}
-                </p>
-                <p>
-                  {t("position")}: {revision.position ?? "—"}
-                </p>
-                <p>
-                  {revision.startDate} → {revision.endDate ?? t("currentAssignment")}
-                </p>
-                <p>
-                  {t("primaryDepartment")}: {t(revision.isPrimary ? "yes" : "no")}
-                </p>
-              </div>
-            ))}
-          </div>
-        )}
-      </FormDialog>
+      />
     </div>
   );
 }
diff --git a/modules/companies/src/web/components/person-editor-dialog.tsx b/modules/companies/src/web/components/person-editor-dialog.tsx
new file mode 100644
index 0000000..1e6cdeb
--- /dev/null
+++ b/modules/companies/src/web/components/person-editor-dialog.tsx
@@ -0,0 +1,28 @@
+import { FormDialog } from "@repo/shadcn-ui/components/form-dialog";
+import type { ComponentProps } from "react";
+import { useTranslation } from "react-i18next";
+
+import { PersonForm } from "./person-form";
+
+export function PersonEditorDialog({
+  open,
+  onOpenChange,
+  ...formProps
+}: ComponentProps<typeof PersonForm> & {
+  open: boolean;
+  onOpenChange: (open: boolean) => void;
+}) {
+  const { t } = useTranslation("companies");
+  return (
+    <FormDialog
+      cancelLabel={t("cancel")}
+      formActions
+      onOpenChange={onOpenChange}
+      open={open}
+      title={t(formProps.person ? "editPerson" : "newPerson")}
+      wide
+    >
+      <PersonForm {...formProps} key={formProps.person?.id ?? "new"} />
+    </FormDialog>
+  );
+}
diff --git a/modules/companies/src/web/components/site-editor-dialog.tsx b/modules/companies/src/web/components/site-editor-dialog.tsx
new file mode 100644
index 0000000..8d6860d
--- /dev/null
+++ b/modules/companies/src/web/components/site-editor-dialog.tsx
@@ -0,0 +1,27 @@
+import { FormDialog } from "@repo/shadcn-ui/components/form-dialog";
+import type { ComponentProps } from "react";
+import { useTranslation } from "react-i18next";
+
+import { SiteForm } from "./site-form";
+
+export function SiteEditorDialog({
+  open,
+  onOpenChange,
+  ...formProps
+}: Omit<ComponentProps<typeof SiteForm>, "showTitle"> & {
+  open: boolean;
+  onOpenChange: (open: boolean) => void;
+}) {
+  const { t } = useTranslation("companies");
+  return (
+    <FormDialog
+      cancelLabel={t("cancel")}
+      formActions
+      onOpenChange={onOpenChange}
+      open={open}
+      title={t(formProps.site ? "editSite" : "newSite")}
+    >
+      <SiteForm {...formProps} key={formProps.site?.id ?? "new"} showTitle={false} />
+    </FormDialog>
+  );
+}
diff --git a/modules/companies/src/web/components/site-section.tsx b/modules/companies/src/web/components/site-section.tsx
index fddf15f..35675ee 100644
--- a/modules/companies/src/web/components/site-section.tsx
+++ b/modules/companies/src/web/components/site-section.tsx
@@ -5,13 +5,12 @@ import {
   EntityRowActions,
   EntityTable,
 } from "@repo/shadcn-ui/components/entity-list";
-import { FormDialog } from "@repo/shadcn-ui/components/form-dialog";
 import { useState } from "react";
 import { useTranslation } from "react-i18next";
 
 import type { CompanyDTO } from "../../common";
 
-import { SiteForm } from "./site-form";
+import { SiteEditorDialog } from "./site-editor-dialog";
 
 export function SiteSection({ company, csrfToken }: { company: CompanyDTO; csrfToken: string }) {
   const { t, i18n } = useTranslation("companies");
@@ -58,42 +57,25 @@ export function SiteSection({ company, csrfToken }: { company: CompanyDTO; csrfT
         locale={i18n.language}
         title={t("sites")}
       />
-      <FormDialog
-        cancelLabel={t("cancel")}
-        formActions
+      <SiteEditorDialog
+        companyId={company.id}
+        csrfToken={csrfToken}
         onOpenChange={setCreateOpen}
+        onSaved={() => setCreateOpen(false)}
         open={createOpen}
-        title={t("newSite")}
-      >
-        <SiteForm
-          companyId={company.id}
-          csrfToken={csrfToken}
-          onSaved={() => setCreateOpen(false)}
-          showTitle={false}
-        />
-      </FormDialog>
-      <FormDialog
-        cancelLabel={t("cancel")}
-        formActions
+      />
+      <SiteEditorDialog
+        companyId={company.id}
+        csrfToken={csrfToken}
         onOpenChange={(open) => {
           if (!open) {
             setSelectedId(undefined);
           }
         }}
+        onSaved={() => setSelectedId(undefined)}
         open={selected !== undefined}
-        title={t("editSite")}
-      >
-        {selected && (
-          <SiteForm
-            companyId={company.id}
-            csrfToken={csrfToken}
-            key={selected.id}
-            onSaved={() => setSelectedId(undefined)}
-            showTitle={false}
-            site={selected}
-          />
-        )}
-      </FormDialog>
+        {...(selected ? { site: selected } : {})}
+      />
     </div>
   );
 }
diff --git a/modules/companies/src/web/components/workspace-header.tsx b/modules/companies/src/web/components/workspace-header.tsx
new file mode 100644
index 0000000..76cc4c1
--- /dev/null
+++ b/modules/companies/src/web/components/workspace-header.tsx
@@ -0,0 +1,119 @@
+import { Button } from "@repo/shadcn-ui/components/button";
+import { Input } from "@repo/shadcn-ui/components/input";
+import { BellIcon, ChevronDownIcon, SearchIcon } from "@repo/shadcn-ui/lib/icons";
+import type { ReactNode } from "react";
+import { useState } from "react";
+import { useTranslation } from "react-i18next";
+
+import type { WorkspaceLocation } from "./workspace-location";
+export function WorkspaceHeader({
+  companies,
+  onNavigate,
+  onSelectCompany,
+  accountNavigation,
+  userName,
+  languageSwitcher,
+}: {
+  companies: readonly { id: string; name: string }[];
+  onNavigate: (location: WorkspaceLocation) => void;
+  onSelectCompany: (id: string) => void;
+  accountNavigation: ReactNode;
+  userName: string;
+  languageSwitcher: ReactNode;
+}) {
+  const { t } = useTranslation("companies");
+  const { t: coreTranslation } = useTranslation("core");
+  const [search, setSearch] = useState("");
+  return (
+    <header className="desk-global-header">
+      <div className="desk-search">
+        <SearchIcon aria-hidden="true" />
+        <Input
+          aria-label={coreTranslation("shell.search")}
+          onChange={(event) => setSearch(event.target.value)}
+          onKeyDown={(event) => {
+            if (event.key === "Escape") {
+              setSearch("");
+            }
+          }}
+          placeholder={coreTranslation("shell.search")}
+          value={search}
+        />
+        {search.trim() && (
+          <section aria-label={coreTranslation("shell.results")} className="desk-search-results">
+            {companies
+              .filter((company) =>
+                company.name.toLocaleLowerCase().includes(search.trim().toLocaleLowerCase())
+              )
+              .map((company) => (
+                <Button
+                  key={company.id}
+                  onClick={() => {
+                    onSelectCompany(company.id);
+                    setSearch("");
+                  }}
+                  variant="ghost"
+                >
+                  {company.name}
+                </Button>
+              ))}
+            {(
+              [
+                ["home", "dashboard.title"],
+                ["directory", "title"],
+                ["catalogs", "shell.catalogs"],
+                ["tickets", "tickets.global"],
+                ["interventions", "interventions.global"],
+              ] as const
+            )
+              .filter(([, label]) =>
+                t(label).toLocaleLowerCase().includes(search.trim().toLocaleLowerCase())
+              )
+              .map(([area, label]) => (
+                <Button
+                  key={area}
+                  onClick={() => {
+                    onNavigate({ area });
+                    setSearch("");
+                  }}
+                  variant="ghost"
+                >
+                  {t(label)}
+                </Button>
+              ))}
+            <p>{coreTranslation("shell.searchScope")}</p>
+          </section>
+        )}
+      </div>
+      <span
+        aria-label={coreTranslation("shell.notificationsUnavailable")}
+        className="desk-notifications"
+        role="img"
+        title={coreTranslation("shell.notificationsUnavailable")}
+      >
+        <BellIcon aria-hidden="true" />
+      </span>
+      <details className="desk-profile">
+        <summary aria-label={coreTranslation("shell.profile")}>
+          <span aria-hidden="true" className="desk-avatar">
+            {userName
+              .trim()
+              .split(/\s+/)
+              .slice(0, 2)
+              .map((word) => word[0])
+              .join("")}
+          </span>
+          <span className="desk-profile-copy">
+            <strong>{userName}</strong>
+            <span>{coreTranslation("shell.supportWorkspace")}</span>
+          </span>
+          <ChevronDownIcon aria-hidden="true" />
+        </summary>
+        <div className="desk-profile-menu">
+          {accountNavigation}
+          {languageSwitcher}
+        </div>
+      </details>
+    </header>
+  );
+}
diff --git a/modules/companies/src/web/components/workspace-settings-dialog.tsx b/modules/companies/src/web/components/workspace-settings-dialog.tsx
new file mode 100644
index 0000000..ede32ab
--- /dev/null
+++ b/modules/companies/src/web/components/workspace-settings-dialog.tsx
@@ -0,0 +1,29 @@
+import { FormDialog } from "@repo/shadcn-ui/components/form-dialog";
+import type { ReactNode } from "react";
+import { useTranslation } from "react-i18next";
+
+export function WorkspaceSettingsDialog({
+  open,
+  accountNavigation,
+  languageSwitcher,
+  onOpenChange,
+}: {
+  open: boolean;
+  accountNavigation: ReactNode;
+  languageSwitcher: ReactNode;
+  onOpenChange: (open: boolean) => void;
+}) {
+  const { t } = useTranslation("companies");
+  const { t: coreTranslation } = useTranslation("core");
+  return (
+    <FormDialog
+      cancelLabel={t("cancel")}
+      onOpenChange={onOpenChange}
+      open={open}
+      title={coreTranslation("shell.settings")}
+    >
+      {accountNavigation}
+      {languageSwitcher}
+    </FormDialog>
+  );
+}
diff --git a/modules/companies/src/web/components/workspace-sidebar.tsx b/modules/companies/src/web/components/workspace-sidebar.tsx
new file mode 100644
index 0000000..da1ea56
--- /dev/null
+++ b/modules/companies/src/web/components/workspace-sidebar.tsx
@@ -0,0 +1,141 @@
+import { Button } from "@repo/shadcn-ui/components/button";
+import {
+  Building2Icon,
+  ChevronRightIcon,
+  DatabaseIcon,
+  HomeIcon,
+  SettingsIcon,
+  TicketIcon,
+  WrenchIcon,
+} from "@repo/shadcn-ui/lib/icons";
+import type { ComponentProps } from "react";
+import { useTranslation } from "react-i18next";
+
+import type { WorkspaceContent } from "./workspace-content";
+import type { WorkspaceLocation } from "./workspace-location";
+export function WorkspaceSidebar({
+  companies,
+  current,
+  catalog,
+  onNavigate,
+  onSelectCompany,
+  onSelectCatalog,
+  onSettings,
+}: {
+  companies: readonly { id: string; name: string }[];
+  onNavigate: (location: WorkspaceLocation) => void;
+  onSelectCompany: (id: string) => void;
+  current: WorkspaceLocation;
+  catalog: ComponentProps<typeof WorkspaceContent>["catalog"];
+  onSelectCatalog: (catalog: ComponentProps<typeof WorkspaceContent>["catalog"]) => void;
+  onSettings: () => void;
+}) {
+  const { t } = useTranslation("companies");
+  const { t: coreTranslation } = useTranslation("core");
+  const { t: resourceTranslation } = useTranslation("resources");
+  const { t: assetTranslation } = useTranslation("assets");
+  const { t: accessTranslation } = useTranslation("access");
+  return (
+    <aside className="desk-sidebar">
+      <div className="desk-brand">
+        <svg aria-hidden="true" viewBox="0 0 36 30">
+          <path
+            d="M5 24 13 7l9 17 9-18"
+            fill="none"
+            stroke="currentColor"
+            strokeLinecap="round"
+            strokeLinejoin="round"
+            strokeWidth="7"
+          />
+        </svg>
+        <span>Metis Desk</span>
+      </div>
+      <nav aria-label={t("companySpaces")} className="desk-company-rail">
+        {(
+          [
+            ["home", "dashboard.title", HomeIcon],
+            ["directory", "title", Building2Icon],
+            ["catalogs", "shell.catalogs", DatabaseIcon],
+            ["tickets", "shell.tickets", TicketIcon],
+            ["interventions", "shell.interventions", WrenchIcon],
+          ] as const
+        ).map(([area, label, Icon]) => (
+          <Button
+            aria-label={t(label)}
+            aria-pressed={current.area === area}
+            className="desk-space-button"
+            key={area}
+            onClick={() => onNavigate({ area })}
+            variant="ghost"
+          >
+            <Icon aria-hidden="true" />
+            <span>{t(label)}</span>
+            {area === "catalogs" && (
+              <ChevronRightIcon aria-hidden="true" className="desk-nav-chevron" />
+            )}
+          </Button>
+        ))}
+        {current.area === "catalogs" && (
+          <nav aria-label={t("globalCatalogs")} className="desk-catalog-navigation">
+            <>
+              <Button
+                aria-pressed={catalog === "access"}
+                onClick={() => onSelectCatalog("access")}
+                variant="ghost"
+              >
+                {accessTranslation("catalogTitle")}
+              </Button>
+              <Button
+                aria-pressed={catalog === "assets"}
+                onClick={() => onSelectCatalog("assets")}
+                variant="ghost"
+              >
+                {assetTranslation("title")}
+              </Button>
+              <Button
+                aria-pressed={catalog === "intervention-templates"}
+                onClick={() => onSelectCatalog("intervention-templates")}
+                variant="ghost"
+              >
+                {t("interventionTemplates.title")}
+              </Button>
+              <Button
+                aria-pressed={catalog === "brands"}
+                onClick={() => onSelectCatalog("brands")}
+                variant="ghost"
+              >
+                {assetTranslation("brands.title")}
+              </Button>
+              <Button
+                aria-pressed={catalog === "resources"}
+                onClick={() => onSelectCatalog("resources")}
+                variant="ghost"
+              >
+                {resourceTranslation("title")}
+              </Button>
+            </>
+          </nav>
+        )}
+        <Button className="desk-space-button" onClick={onSettings} variant="ghost">
+          <SettingsIcon aria-hidden="true" />
+          <span>{coreTranslation("shell.settings")}</span>
+        </Button>
+        <div className="desk-rail-separator" />
+        {companies.map((company) => (
+          <Button
+            aria-label={company.name}
+            aria-pressed={current.area === "company" && current.id === company.id}
+            className="desk-space-button"
+            key={company.id}
+            onClick={() => onSelectCompany(company.id)}
+            title={company.name}
+            variant="ghost"
+          >
+            <Building2Icon aria-hidden="true" />
+            <span>{company.name}</span>
+          </Button>
+        ))}
+      </nav>
+    </aside>
+  );
+}
diff --git a/modules/companies/src/web/folders/folder-api.ts b/modules/companies/src/web/folders/folder-api.ts
index 88dfffb..7f2c056 100644
--- a/modules/companies/src/web/folders/folder-api.ts
+++ b/modules/companies/src/web/folders/folder-api.ts
@@ -1,7 +1,7 @@
 import { z } from "zod/v4";
 
+import type { FolderMappingInput } from "../../common/folder-mappings";
 import {
-  type FolderMappingInput,
   FolderMappingResponseSchema,
   FolderMappingsResponseSchema,
 } from "../../common/folder-mappings";
diff --git a/modules/companies/src/web/folders/folder-mapping-editor-dialog.tsx b/modules/companies/src/web/folders/folder-mapping-editor-dialog.tsx
new file mode 100644
index 0000000..b442884
--- /dev/null
+++ b/modules/companies/src/web/folders/folder-mapping-editor-dialog.tsx
@@ -0,0 +1,46 @@
+import { FormDialog } from "@repo/shadcn-ui/components/form-dialog";
+import type { ComponentProps } from "react";
+import { useTranslation } from "react-i18next";
+
+import type { CompanyDTO } from "../../common";
+
+import { FolderMappingForm } from "./folder-mapping-form";
+
+export function FolderMappingEditorDialog({
+  mapping,
+  company,
+  csrfToken,
+  initialProfileId,
+  onClose,
+}: {
+  mapping: ComponentProps<typeof FolderMappingForm>["mapping"];
+  company: CompanyDTO;
+  csrfToken: string;
+  initialProfileId: ComponentProps<typeof FolderMappingForm>["initialProfileId"];
+  onClose: () => void;
+}) {
+  const { t } = useTranslation("companies");
+
+  return (
+    <FormDialog
+      cancelLabel={t("cancel")}
+      formActions
+      onOpenChange={(open) => {
+        if (!open) {
+          onClose();
+        }
+      }}
+      open
+      title={t(mapping ? "folders.edit" : "folders.new")}
+      wide
+    >
+      <FolderMappingForm
+        company={company}
+        csrfToken={csrfToken}
+        initialProfileId={initialProfileId ?? ""}
+        mapping={mapping}
+        onSaved={() => onClose()}
+      />
+    </FormDialog>
+  );
+}
diff --git a/modules/companies/src/web/folders/folder-mapping-form.tsx b/modules/companies/src/web/folders/folder-mapping-form.tsx
index 9c43cb6..4ae8496 100644
--- a/modules/companies/src/web/folders/folder-mapping-form.tsx
+++ b/modules/companies/src/web/folders/folder-mapping-form.tsx
@@ -12,12 +12,8 @@ import { useForm } from "react-hook-form";
 import { useTranslation } from "react-i18next";
 
 import type { AccessItemDTO, AccessResponseDTO, CompanyDTO } from "../../common";
-import {
-  FOLDER_STATE_TRANSITIONS,
-  type FolderMappingDTO,
-  type FolderMappingInput,
-  FolderMappingInputSchema,
-} from "../../common/folder-mappings";
+import type { FolderMappingDTO, FolderMappingInput } from "../../common/folder-mappings";
+import { FOLDER_STATE_TRANSITIONS, FolderMappingInputSchema } from "../../common/folder-mappings";
 import { accessApi, accessKeys } from "../access/access-api";
 import { profileApi, profileKeys } from "../profiles/work-profile-api";
 
diff --git a/modules/companies/src/web/folders/folder-mapping-history-dialog.tsx b/modules/companies/src/web/folders/folder-mapping-history-dialog.tsx
new file mode 100644
index 0000000..0ab908f
--- /dev/null
+++ b/modules/companies/src/web/folders/folder-mapping-history-dialog.tsx
@@ -0,0 +1,50 @@
+import { FormDialog } from "@repo/shadcn-ui/components/form-dialog";
+import { useTranslation } from "react-i18next";
+
+import type { FolderMappingDTO } from "../../common/folder-mappings";
+
+export function FolderMappingHistoryDialog({
+  mapping,
+  onClose,
+}: {
+  mapping: FolderMappingDTO;
+  onClose: () => void;
+}) {
+  const { t, i18n } = useTranslation("companies");
+
+  return (
+    <FormDialog
+      cancelLabel={t("close")}
+      onOpenChange={(open) => {
+        if (!open) {
+          onClose();
+        }
+      }}
+      open
+      title={t("mail.history")}
+      wide
+    >
+      <ol className="space-y-3">
+        {[...mapping.history].reverse().map((revision) => (
+          <li className="rounded-md border p-3 text-sm" key={revision.id}>
+            <p className="font-medium">
+              {new Intl.DateTimeFormat(i18n.language, {
+                dateStyle: "medium",
+                timeStyle: "short",
+              }).format(new Date(revision.recordedAt))}{" "}
+              · {revision.actorName}
+            </p>
+            <p className="font-mono">
+              {revision.values.driveLetter ? `${revision.values.driveLetter}:` : "—"}{" "}
+              {revision.values.path}
+            </p>
+            <p>{t(`mail.${revision.values.state}`)}</p>
+            {revision.values.notes && (
+              <p className="whitespace-pre-wrap mt-2">{revision.values.notes}</p>
+            )}
+          </li>
+        ))}
+      </ol>
+    </FormDialog>
+  );
+}
diff --git a/modules/companies/src/web/folders/folder-mappings-page.tsx b/modules/companies/src/web/folders/folder-mappings-page.tsx
index e801c5f..db132e0 100644
--- a/modules/companies/src/web/folders/folder-mappings-page.tsx
+++ b/modules/companies/src/web/folders/folder-mappings-page.tsx
@@ -6,7 +6,6 @@ import {
   EntityStatus,
   EntityTable,
 } from "@repo/shadcn-ui/components/entity-list";
-import { FormDialog } from "@repo/shadcn-ui/components/form-dialog";
 import { useQuery } from "@tanstack/react-query";
 import { useState } from "react";
 import { useTranslation } from "react-i18next";
@@ -17,7 +16,8 @@ import { profileApi, profileKeys } from "../profiles/work-profile-api";
 
 import { folderApi, folderKeys } from "./folder-api";
 import { FolderFeedback } from "./folder-feedback";
-import { FolderMappingForm } from "./folder-mapping-form";
+import { FolderMappingEditorDialog } from "./folder-mapping-editor-dialog";
+import { FolderMappingHistoryDialog } from "./folder-mapping-history-dialog";
 
 export function FolderMappingsPage({
   company,
@@ -186,62 +186,15 @@ export function FolderMappingsPage({
         />
       )}
       {editor && (
-        <FormDialog
-          cancelLabel={t("cancel")}
-          formActions
-          onOpenChange={(open) => {
-            if (!open) {
-              setEditor(undefined);
-            }
-          }}
-          open
-          title={t(edited ? "folders.edit" : "folders.new")}
-          wide
-        >
-          <FolderMappingForm
-            company={company}
-            csrfToken={csrfToken}
-            initialProfileId={initialProfileId ?? ""}
-            mapping={edited}
-            onSaved={() => setEditor(undefined)}
-          />
-        </FormDialog>
-      )}
-      {viewed && (
-        <FormDialog
-          cancelLabel={t("close")}
-          onOpenChange={(open) => {
-            if (!open) {
-              setView(undefined);
-            }
-          }}
-          open
-          title={t("mail.history")}
-          wide
-        >
-          <ol className="space-y-3">
-            {[...viewed.history].reverse().map((revision) => (
-              <li className="rounded-md border p-3 text-sm" key={revision.id}>
-                <p className="font-medium">
-                  {new Intl.DateTimeFormat(i18n.language, {
-                    dateStyle: "medium",
-                    timeStyle: "short",
-                  }).format(new Date(revision.recordedAt))}{" "}
-                  · {revision.actorName}
-                </p>
-                <p className="font-mono">
-                  {revision.values.driveLetter ? `${revision.values.driveLetter}:` : "—"}{" "}
-                  {revision.values.path}
-                </p>
-                <p>{t(`mail.${revision.values.state}`)}</p>
-                {revision.values.notes && (
-                  <p className="whitespace-pre-wrap mt-2">{revision.values.notes}</p>
-                )}
-              </li>
-            ))}
-          </ol>
-        </FormDialog>
+        <FolderMappingEditorDialog
+          company={company}
+          csrfToken={csrfToken}
+          initialProfileId={initialProfileId ?? ""}
+          mapping={edited}
+          onClose={() => setEditor(undefined)}
+        />
       )}
+      {viewed && <FolderMappingHistoryDialog mapping={viewed} onClose={() => setView(undefined)} />}
     </div>
   );
 }
diff --git a/modules/companies/src/web/intervention-templates/intervention-template-editor-dialog.tsx b/modules/companies/src/web/intervention-templates/intervention-template-editor-dialog.tsx
new file mode 100644
index 0000000..cb0e1e6
--- /dev/null
+++ b/modules/companies/src/web/intervention-templates/intervention-template-editor-dialog.tsx
@@ -0,0 +1,54 @@
+import { FormDialog } from "@repo/shadcn-ui/components/form-dialog";
+import type { ComponentProps } from "react";
+import { useTranslation } from "react-i18next";
+
+import { InterventionTemplateForm, copyTemplateValues } from "./template-form";
+
+export function InterventionTemplateEditorDialog({
+  editor,
+  selected,
+  copied,
+  scope,
+  csrfToken,
+  onSaved,
+  onOpenChange,
+}: {
+  editor: { id?: string; copyId?: string } | undefined;
+  selected: ComponentProps<typeof InterventionTemplateForm>["template"];
+  copied: ComponentProps<typeof InterventionTemplateForm>["template"];
+  scope: string;
+  csrfToken: string;
+  onSaved: () => void;
+  onOpenChange: (open: boolean) => void;
+}) {
+  const { t } = useTranslation("companies");
+
+  return (
+    <FormDialog
+      cancelLabel={t("cancel")}
+      formActions
+      onOpenChange={onOpenChange}
+      open={editor !== undefined}
+      title={t(selected ? "interventionTemplates.edit" : "interventionTemplates.new")}
+      wide
+    >
+      {editor && (
+        <InterventionTemplateForm
+          csrfToken={csrfToken}
+          initialValues={
+            copied
+              ? copyTemplateValues(
+                  copied,
+                  `${t("interventionTemplates.copyOf")} ${copied.values.name}`
+                )
+              : undefined
+          }
+          key={editor.id ?? editor.copyId ?? "new"}
+          onSaved={onSaved}
+          scope={scope}
+          template={selected}
+        />
+      )}
+    </FormDialog>
+  );
+}
diff --git a/modules/companies/src/web/intervention-templates/template-api.ts b/modules/companies/src/web/intervention-templates/template-api.ts
index 2ab5756..539549d 100644
--- a/modules/companies/src/web/intervention-templates/template-api.ts
+++ b/modules/companies/src/web/intervention-templates/template-api.ts
@@ -1,9 +1,9 @@
 import { z } from "zod/v4";
 
+import type { SaveInterventionTemplateInput } from "../../common/intervention-templates";
 import {
   InterventionTemplateResponseSchema,
   InterventionTemplatesSchema,
-  type SaveInterventionTemplateInput,
 } from "../../common/intervention-templates";
 export const interventionTemplateKeys = {
   list: (scope: string) => ["intervention-templates", scope],
diff --git a/modules/companies/src/web/intervention-templates/template-form.tsx b/modules/companies/src/web/intervention-templates/template-form.tsx
index cb3b5e8..9ff1c8d 100644
--- a/modules/companies/src/web/intervention-templates/template-form.tsx
+++ b/modules/companies/src/web/intervention-templates/template-form.tsx
@@ -11,11 +11,11 @@ import { useEffect, useId, useRef, useState } from "react";
 import { useFieldArray, useForm } from "react-hook-form";
 import { useTranslation } from "react-i18next";
 
-import {
-  type InterventionTemplateDTO,
-  type InterventionTemplateInput,
-  InterventionTemplateInputSchema,
+import type {
+  InterventionTemplateDTO,
+  InterventionTemplateInput,
 } from "../../common/intervention-templates";
+import { InterventionTemplateInputSchema } from "../../common/intervention-templates";
 
 import { InterventionTemplateApiError, interventionTemplateApi } from "./template-api";
 import { InterventionTemplateFeedback } from "./template-feedback";
diff --git a/modules/companies/src/web/intervention-templates/templates-page.tsx b/modules/companies/src/web/intervention-templates/templates-page.tsx
index 6a18e87..6e8922c 100644
--- a/modules/companies/src/web/intervention-templates/templates-page.tsx
+++ b/modules/companies/src/web/intervention-templates/templates-page.tsx
@@ -7,16 +7,15 @@ import {
   EntityStatus,
   EntityTable,
 } from "@repo/shadcn-ui/components/entity-list";
-import { FormDialog } from "@repo/shadcn-ui/components/form-dialog";
 import { Label } from "@repo/shadcn-ui/components/label";
 import { useQuery } from "@tanstack/react-query";
 import { useId, useState } from "react";
 import { useTranslation } from "react-i18next";
 
+import { InterventionTemplateEditorDialog } from "./intervention-template-editor-dialog";
 import { interventionTemplateApi, interventionTemplateKeys } from "./template-api";
 import { TemplateSteps } from "./template-detail";
 import { InterventionTemplateFeedback } from "./template-feedback";
-import { InterventionTemplateForm, copyTemplateValues } from "./template-form";
 import { TemplateHistory } from "./template-history";
 export function InterventionTemplatesPage({
   scope = "global",
@@ -176,36 +175,19 @@ export function InterventionTemplatesPage({
           title={t("interventionTemplates.title")}
         />
       )}
-      <FormDialog
-        cancelLabel={t("cancel")}
-        formActions
+      <InterventionTemplateEditorDialog
+        copied={copied}
+        csrfToken={csrfToken}
+        editor={editor}
         onOpenChange={(open) => {
           if (!open) {
             setEditor(undefined);
           }
         }}
-        open={editor !== undefined}
-        title={t(selected ? "interventionTemplates.edit" : "interventionTemplates.new")}
-        wide
-      >
-        {editor && (
-          <InterventionTemplateForm
-            csrfToken={csrfToken}
-            initialValues={
-              copied
-                ? copyTemplateValues(
-                    copied,
-                    `${t("interventionTemplates.copyOf")} ${copied.values.name}`
-                  )
-                : undefined
-            }
-            key={editor.id ?? editor.copyId ?? "new"}
-            onSaved={() => setEditor(undefined)}
-            scope={scope}
-            template={selected}
-          />
-        )}
-      </FormDialog>
+        onSaved={() => setEditor(undefined)}
+        scope={scope}
+        selected={selected}
+      />
     </div>
   );
 }
diff --git a/modules/companies/src/web/interventions/intervention-api.ts b/modules/companies/src/web/interventions/intervention-api.ts
index c618cc2..b9b8277 100644
--- a/modules/companies/src/web/interventions/intervention-api.ts
+++ b/modules/companies/src/web/interventions/intervention-api.ts
@@ -1,10 +1,10 @@
 import { z } from "zod/v4";
 
+import type { SaveInterventionInput } from "../../common/interventions";
 import {
   InterventionListSchema,
   InterventionLookupsSchema,
   InterventionResponseSchema,
-  type SaveInterventionInput,
 } from "../../common/interventions";
 export const interventionKeys = {
   list: (companyId?: string) => ["interventions", companyId ?? "global"],
diff --git a/modules/companies/src/web/interventions/intervention-detail-dialog.tsx b/modules/companies/src/web/interventions/intervention-detail-dialog.tsx
new file mode 100644
index 0000000..e0c387a
--- /dev/null
+++ b/modules/companies/src/web/interventions/intervention-detail-dialog.tsx
@@ -0,0 +1,33 @@
+import { FormDialog } from "@repo/shadcn-ui/components/form-dialog";
+import type { ComponentProps } from "react";
+import { useTranslation } from "react-i18next";
+
+import { InterventionDetail } from "./intervention-detail";
+
+export function InterventionDetailDialog({
+  currentView,
+  data,
+  onClose,
+}: {
+  currentView: ComponentProps<typeof InterventionDetail>["intervention"] | undefined;
+  data: ComponentProps<typeof InterventionDetail>["data"] | undefined;
+  onClose: () => void;
+}) {
+  const { t } = useTranslation("companies");
+
+  return (
+    <FormDialog
+      cancelLabel={t("cancel")}
+      onOpenChange={(value) => {
+        if (!value) {
+          onClose();
+        }
+      }}
+      open={Boolean(currentView)}
+      title={t("interventions.details")}
+      wide
+    >
+      {currentView && data && <InterventionDetail data={data} intervention={currentView} />}
+    </FormDialog>
+  );
+}
diff --git a/modules/companies/src/web/interventions/intervention-editor-dialog.tsx b/modules/companies/src/web/interventions/intervention-editor-dialog.tsx
new file mode 100644
index 0000000..d3379aa
--- /dev/null
+++ b/modules/companies/src/web/interventions/intervention-editor-dialog.tsx
@@ -0,0 +1,45 @@
+import { FormDialog } from "@repo/shadcn-ui/components/form-dialog";
+import type { ComponentProps } from "react";
+import { useTranslation } from "react-i18next";
+
+import { InterventionForm } from "./intervention-form";
+
+export function InterventionEditorDialog({
+  open,
+  edit,
+  companyId,
+  csrfToken,
+  data,
+  onOpenChange,
+}: {
+  open: boolean;
+  edit: ComponentProps<typeof InterventionForm>["intervention"];
+  companyId: string | undefined;
+  csrfToken: string;
+  data: ComponentProps<typeof InterventionForm>["data"] | undefined;
+  onOpenChange: (open: boolean) => void;
+}) {
+  const { t } = useTranslation("companies");
+
+  return (
+    <FormDialog
+      cancelLabel={t("cancel")}
+      formActions
+      onOpenChange={onOpenChange}
+      open={open}
+      title={t(edit ? "interventions.edit" : "interventions.new")}
+      wide
+    >
+      {data && open && (
+        <InterventionForm
+          key={edit?.id ?? "new"}
+          {...(companyId ? { scope: companyId } : {})}
+          {...(edit ? { intervention: edit } : {})}
+          csrfToken={csrfToken}
+          data={data}
+          onSaved={() => onOpenChange(false)}
+        />
+      )}
+    </FormDialog>
+  );
+}
diff --git a/modules/companies/src/web/interventions/intervention-fields.tsx b/modules/companies/src/web/interventions/intervention-fields.tsx
index 6ad9148..0a940a6 100644
--- a/modules/companies/src/web/interventions/intervention-fields.tsx
+++ b/modules/companies/src/web/interventions/intervention-fields.tsx
@@ -5,11 +5,8 @@ import { Textarea } from "@repo/shadcn-ui/components/textarea";
 import type { UseFormReturn } from "react-hook-form";
 import { useTranslation } from "react-i18next";
 
-import {
-  type InterventionInput,
-  InterventionModalitySchema,
-  InterventionStateSchema,
-} from "../../common/interventions";
+import type { InterventionInput } from "../../common/interventions";
+import { InterventionModalitySchema, InterventionStateSchema } from "../../common/interventions";
 export function InterventionWorkFields({
   form,
   prefix,
diff --git a/modules/companies/src/web/interventions/intervention-form.tsx b/modules/companies/src/web/interventions/intervention-form.tsx
index 17cef24..e7236c0 100644
--- a/modules/companies/src/web/interventions/intervention-form.tsx
+++ b/modules/companies/src/web/interventions/intervention-form.tsx
@@ -1,7 +1,7 @@
 import { zodResolver } from "@hookform/resolvers/zod";
 import { UniqueID } from "@repo/rdx-ddd";
 import { Button } from "@repo/shadcn-ui/components/button";
-import { FormActions, FormDialog } from "@repo/shadcn-ui/components/form-dialog";
+import { FormActions } from "@repo/shadcn-ui/components/form-dialog";
 import { Input } from "@repo/shadcn-ui/components/input";
 import { Label } from "@repo/shadcn-ui/components/label";
 import { SelectWithAction } from "@repo/shadcn-ui/components/select-with-action";
@@ -10,16 +10,14 @@ import { useEffect, useId, useRef, useState } from "react";
 import { useForm } from "react-hook-form";
 import { useTranslation } from "react-i18next";
 
-import {
-  type InterventionDTO,
-  type InterventionInput,
-  InterventionInputSchema,
-  type InterventionListDTO,
-  type SaveInterventionInput,
+import type {
+  InterventionDTO,
+  InterventionInput,
+  InterventionListDTO,
+  SaveInterventionInput,
 } from "../../common/interventions";
+import { InterventionInputSchema } from "../../common/interventions";
 import type { TicketDTO } from "../../common/tickets";
-import { InterventionTemplateForm } from "../intervention-templates/template-form";
-import { TicketForm } from "../tickets/ticket-form";
 import { TicketQuickForms } from "../tickets/ticket-quick-forms";
 import { TicketTargets } from "../tickets/ticket-targets";
 
@@ -30,6 +28,8 @@ import { InterventionWorkFields } from "./intervention-fields";
 import { InterventionHelp } from "./intervention-help";
 import { InterventionProcedureFields } from "./intervention-procedure-fields";
 import { InterventionSteps } from "./intervention-steps";
+import { InterventionTemplateCreateDialog } from "./intervention-template-create-dialog";
+import { InterventionTicketCreateDialog } from "./intervention-ticket-create-dialog";
 
 export function emptyIntervention(ticket?: TicketDTO): InterventionInput {
   return {
@@ -291,67 +291,47 @@ export function InterventionForm({
         }}
         onPerson={() => undefined}
       />
-      <FormDialog
-        cancelLabel={t("cancel")}
-        formActions
+      <InterventionTicketCreateDialog
+        companies={data.companies}
+        companyId={companyId}
+        csrfToken={csrfToken}
         onOpenChange={(open) => {
           if (!open) {
             setQuick(undefined);
           }
         }}
+        onSaved={(id) => {
+          client
+            .invalidateQueries({ queryKey: interventionKeys.lookups(companyId) })
+            .then(() => {
+              form.setValue("ticketId", id);
+              setQuick(undefined);
+            })
+            .catch(() => undefined);
+        }}
         open={quick === "ticket"}
-        title={t("tickets.new")}
-        wide
-      >
-        {quick === "ticket" && (
-          <TicketForm
-            csrfToken={csrfToken}
-            data={{
-              companies: data.companies,
-              technicians: data.technicians,
-              tickets: lookups.data?.tickets ?? [],
-            }}
-            onSaved={(id) => {
-              client
-                .invalidateQueries({ queryKey: interventionKeys.lookups(companyId) })
-                .then(() => {
-                  form.setValue("ticketId", id);
-                  setQuick(undefined);
-                })
-                .catch(() => undefined);
-            }}
-            scope={companyId}
-          />
-        )}
-      </FormDialog>
-      <FormDialog
-        cancelLabel={t("cancel")}
-        formActions
+        technicians={data.technicians}
+        tickets={lookups.data?.tickets ?? []}
+      />
+      <InterventionTemplateCreateDialog
+        companyId={companyId}
+        csrfToken={csrfToken}
         onOpenChange={(open) => {
           if (!open) {
             setQuick(undefined);
           }
         }}
+        onSaved={(id) => {
+          client
+            .invalidateQueries({ queryKey: interventionKeys.lookups(companyId) })
+            .then(() => {
+              setSelectedTemplate(id);
+              setQuick(undefined);
+            })
+            .catch(() => undefined);
+        }}
         open={quick === "template"}
-        title={t("interventions.newTemplate")}
-        wide
-      >
-        {quick === "template" && (
-          <InterventionTemplateForm
-            csrfToken={csrfToken}
-            onSaved={(id) => {
-              client
-                .invalidateQueries({ queryKey: interventionKeys.lookups(companyId) })
-                .then(() => {
-                  setSelectedTemplate(id);
-                  setQuick(undefined);
-                })
-                .catch(() => undefined);
-            }}
-            scope={companyId}
-          />
-        )}
-      </FormDialog>
+      />
     </>
   );
 }
diff --git a/modules/companies/src/web/interventions/intervention-steps.tsx b/modules/companies/src/web/interventions/intervention-steps.tsx
index 70e41dc..2087028 100644
--- a/modules/companies/src/web/interventions/intervention-steps.tsx
+++ b/modules/companies/src/web/interventions/intervention-steps.tsx
@@ -5,10 +5,12 @@ import { Input } from "@repo/shadcn-ui/components/input";
 import { Label } from "@repo/shadcn-ui/components/label";
 import { SelectWithAction } from "@repo/shadcn-ui/components/select-with-action";
 import { Textarea } from "@repo/shadcn-ui/components/textarea";
-import { type UseFormReturn, useFieldArray } from "react-hook-form";
+import type { UseFormReturn } from "react-hook-form";
+import { useFieldArray } from "react-hook-form";
 import { useTranslation } from "react-i18next";
 
-import { type InterventionInput, InterventionStepStateSchema } from "../../common/interventions";
+import type { InterventionInput } from "../../common/interventions";
+import { InterventionStepStateSchema } from "../../common/interventions";
 export function InterventionSteps({
   form,
   prefix,
diff --git a/modules/companies/src/web/interventions/intervention-template-create-dialog.tsx b/modules/companies/src/web/interventions/intervention-template-create-dialog.tsx
new file mode 100644
index 0000000..d36ee74
--- /dev/null
+++ b/modules/companies/src/web/interventions/intervention-template-create-dialog.tsx
@@ -0,0 +1,35 @@
+import { FormDialog } from "@repo/shadcn-ui/components/form-dialog";
+import { useTranslation } from "react-i18next";
+
+import { InterventionTemplateForm } from "../intervention-templates/template-form";
+
+export function InterventionTemplateCreateDialog({
+  open,
+  companyId,
+  csrfToken,
+  onSaved,
+  onOpenChange,
+}: {
+  open: boolean;
+  companyId: string;
+  csrfToken: string;
+  onSaved: (id: string) => void;
+  onOpenChange: (open: boolean) => void;
+}) {
+  const { t } = useTranslation("companies");
+
+  return (
+    <FormDialog
+      cancelLabel={t("cancel")}
+      formActions
+      onOpenChange={onOpenChange}
+      open={open}
+      title={t("interventions.newTemplate")}
+      wide
+    >
+      {open && (
+        <InterventionTemplateForm csrfToken={csrfToken} onSaved={onSaved} scope={companyId} />
+      )}
+    </FormDialog>
+  );
+}
diff --git a/modules/companies/src/web/interventions/intervention-ticket-create-dialog.tsx b/modules/companies/src/web/interventions/intervention-ticket-create-dialog.tsx
new file mode 100644
index 0000000..7f3119e
--- /dev/null
+++ b/modules/companies/src/web/interventions/intervention-ticket-create-dialog.tsx
@@ -0,0 +1,51 @@
+import { FormDialog } from "@repo/shadcn-ui/components/form-dialog";
+import type { ComponentProps } from "react";
+import { useTranslation } from "react-i18next";
+
+import { TicketForm } from "../tickets/ticket-form";
+
+export function InterventionTicketCreateDialog({
+  open,
+  companyId,
+  csrfToken,
+  tickets,
+  companies,
+  technicians,
+  onSaved,
+  onOpenChange,
+}: {
+  open: boolean;
+  companyId: string;
+  csrfToken: string;
+  tickets: ComponentProps<typeof TicketForm>["data"]["tickets"];
+  companies: ComponentProps<typeof TicketForm>["data"]["companies"];
+  technicians: ComponentProps<typeof TicketForm>["data"]["technicians"];
+  onSaved: (id: string) => void;
+  onOpenChange: (open: boolean) => void;
+}) {
+  const { t } = useTranslation("companies");
+
+  return (
+    <FormDialog
+      cancelLabel={t("cancel")}
+      formActions
+      onOpenChange={onOpenChange}
+      open={open}
+      title={t("tickets.new")}
+      wide
+    >
+      {open && (
+        <TicketForm
+          csrfToken={csrfToken}
+          data={{
+            companies: companies,
+            technicians: technicians,
+            tickets: tickets,
+          }}
+          onSaved={onSaved}
+          scope={companyId}
+        />
+      )}
+    </FormDialog>
+  );
+}
diff --git a/modules/companies/src/web/interventions/interventions-page.tsx b/modules/companies/src/web/interventions/interventions-page.tsx
index cb56c81..e4af39e 100644
--- a/modules/companies/src/web/interventions/interventions-page.tsx
+++ b/modules/companies/src/web/interventions/interventions-page.tsx
@@ -6,18 +6,18 @@ import {
   EntityStatus,
   EntityTable,
 } from "@repo/shadcn-ui/components/entity-list";
-import { FormDialog } from "@repo/shadcn-ui/components/form-dialog";
 import { SelectWithAction } from "@repo/shadcn-ui/components/select-with-action";
 import { useQuery } from "@tanstack/react-query";
 import { useState } from "react";
 import { useTranslation } from "react-i18next";
 
-import { type InterventionDTO, InterventionStateSchema } from "../../common/interventions";
+import type { InterventionDTO } from "../../common/interventions";
+import { InterventionStateSchema } from "../../common/interventions";
 
 import { interventionApi, interventionKeys } from "./intervention-api";
-import { InterventionDetail } from "./intervention-detail";
+import { InterventionDetailDialog } from "./intervention-detail-dialog";
+import { InterventionEditorDialog } from "./intervention-editor-dialog";
 import { InterventionFeedback } from "./intervention-feedback";
-import { InterventionForm } from "./intervention-form";
 export type InterventionFilters = {
   search: string;
   company: string;
@@ -319,40 +319,19 @@ export function InterventionsPage({
         title={t(companyId ? "interventions.title" : "interventions.global")}
         unavailable={query.isError}
       />
-      <FormDialog
-        cancelLabel={t("cancel")}
-        formActions
+      <InterventionEditorDialog
+        companyId={companyId}
+        csrfToken={csrfToken}
+        data={query.data}
+        edit={edit}
         onOpenChange={setOpen}
         open={open}
-        title={t(edit ? "interventions.edit" : "interventions.new")}
-        wide
-      >
-        {query.data && open && (
-          <InterventionForm
-            key={edit?.id ?? "new"}
-            {...(companyId ? { scope: companyId } : {})}
-            {...(edit ? { intervention: edit } : {})}
-            csrfToken={csrfToken}
-            data={query.data}
-            onSaved={() => setOpen(false)}
-          />
-        )}
-      </FormDialog>
-      <FormDialog
-        cancelLabel={t("cancel")}
-        onOpenChange={(value) => {
-          if (!value) {
-            setViewId(undefined);
-          }
-        }}
-        open={Boolean(currentView)}
-        title={t("interventions.details")}
-        wide
-      >
-        {currentView && query.data && (
-          <InterventionDetail data={query.data} intervention={currentView} />
-        )}
-      </FormDialog>
+      />
+      <InterventionDetailDialog
+        currentView={currentView}
+        data={query.data}
+        onClose={() => setViewId(undefined)}
+      />
     </div>
   );
 }
diff --git a/modules/companies/src/web/mail/mail-api.ts b/modules/companies/src/web/mail/mail-api.ts
index 8f974da..17586f3 100644
--- a/modules/companies/src/web/mail/mail-api.ts
+++ b/modules/companies/src/web/mail/mail-api.ts
@@ -1,7 +1,7 @@
 import { z } from "zod/v4";
 
+import type { MailConfigurationInput } from "../../common/mail-configurations";
 import {
-  type MailConfigurationInput,
   MailConfigurationResponseSchema,
   MailConfigurationsResponseSchema,
 } from "../../common/mail-configurations";
diff --git a/modules/companies/src/web/mail/mail-configuration-editor-dialog.tsx b/modules/companies/src/web/mail/mail-configuration-editor-dialog.tsx
new file mode 100644
index 0000000..8096ab5
--- /dev/null
+++ b/modules/companies/src/web/mail/mail-configuration-editor-dialog.tsx
@@ -0,0 +1,46 @@
+import { FormDialog } from "@repo/shadcn-ui/components/form-dialog";
+import type { ComponentProps } from "react";
+import { useTranslation } from "react-i18next";
+
+import type { CompanyDTO } from "../../common";
+
+import { MailConfigurationForm } from "./mail-configuration-form";
+
+export function MailConfigurationEditorDialog({
+  configuration,
+  company,
+  csrfToken,
+  initialProfileId,
+  onClose,
+}: {
+  configuration: ComponentProps<typeof MailConfigurationForm>["configuration"];
+  company: CompanyDTO;
+  csrfToken: string;
+  initialProfileId: ComponentProps<typeof MailConfigurationForm>["initialProfileId"];
+  onClose: () => void;
+}) {
+  const { t } = useTranslation("companies");
+
+  return (
+    <FormDialog
+      cancelLabel={t("cancel")}
+      formActions
+      onOpenChange={(open) => {
+        if (!open) {
+          onClose();
+        }
+      }}
+      open
+      title={t(configuration ? "mail.edit" : "mail.new")}
+      wide
+    >
+      <MailConfigurationForm
+        company={company}
+        configuration={configuration}
+        csrfToken={csrfToken}
+        initialProfileId={initialProfileId ?? ""}
+        onSaved={() => onClose()}
+      />
+    </FormDialog>
+  );
+}
diff --git a/modules/companies/src/web/mail/mail-configuration-form.tsx b/modules/companies/src/web/mail/mail-configuration-form.tsx
index 748ef97..6ac871a 100644
--- a/modules/companies/src/web/mail/mail-configuration-form.tsx
+++ b/modules/companies/src/web/mail/mail-configuration-form.tsx
@@ -11,10 +11,12 @@ import { useForm } from "react-hook-form";
 import { useTranslation } from "react-i18next";
 
 import type { CompanyDTO } from "../../common";
+import type {
+  MailConfigurationDTO,
+  MailConfigurationInput,
+} from "../../common/mail-configurations";
 import {
   MAIL_STATE_TRANSITIONS,
-  type MailConfigurationDTO,
-  type MailConfigurationInput,
   MailConfigurationInputSchema,
 } from "../../common/mail-configurations";
 import type { MailboxDTO, MailboxUseDTO } from "../../common/mailboxes";
diff --git a/modules/companies/src/web/mail/mail-configuration-history-dialog.tsx b/modules/companies/src/web/mail/mail-configuration-history-dialog.tsx
new file mode 100644
index 0000000..7f1423c
--- /dev/null
+++ b/modules/companies/src/web/mail/mail-configuration-history-dialog.tsx
@@ -0,0 +1,52 @@
+import { FormDialog } from "@repo/shadcn-ui/components/form-dialog";
+import { useTranslation } from "react-i18next";
+
+import type { MailConfigurationDTO } from "../../common/mail-configurations";
+
+export function MailConfigurationHistoryDialog({
+  configuration,
+  target,
+  onClose,
+}: {
+  configuration: MailConfigurationDTO;
+  target: (values: MailConfigurationDTO["values"]) => string;
+  onClose: () => void;
+}) {
+  const { t, i18n } = useTranslation("companies");
+
+  return (
+    <FormDialog
+      cancelLabel={t("close")}
+      onOpenChange={(open) => {
+        if (!open) {
+          onClose();
+        }
+      }}
+      open
+      title={t("mail.history")}
+      wide
+    >
+      <ol className="space-y-3">
+        {[...configuration.history].reverse().map((revision) => (
+          <li className="rounded-md border p-3 text-sm" key={revision.id}>
+            <p className="font-medium">
+              {new Intl.DateTimeFormat(i18n.language, {
+                dateStyle: "medium",
+                timeStyle: "short",
+              }).format(new Date(revision.recordedAt))}{" "}
+              · {revision.actorName}
+            </p>
+            <p>
+              {revision.values.address} · {t(`mail.${revision.values.method}`)} ·{" "}
+              {t(`mail.${revision.values.state}`)}
+            </p>
+            <p>{target(revision.values)}</p>
+            {revision.values.notes && (
+              <p className="mt-2 whitespace-pre-wrap">{revision.values.notes}</p>
+            )}
+          </li>
+        ))}
+      </ol>
+    </FormDialog>
+  );
+}
diff --git a/modules/companies/src/web/mail/mail-configuration-targets.tsx b/modules/companies/src/web/mail/mail-configuration-targets.tsx
index a334f4c..2351856 100644
--- a/modules/companies/src/web/mail/mail-configuration-targets.tsx
+++ b/modules/companies/src/web/mail/mail-configuration-targets.tsx
@@ -3,10 +3,8 @@ import { SelectWithAction } from "@repo/shadcn-ui/components/select-with-action"
 import type { UseFormReturn } from "react-hook-form";
 import { useTranslation } from "react-i18next";
 
-import {
-  type MailConfigurationInput,
-  MailConfigurationInputSchema,
-} from "../../common/mail-configurations";
+import type { MailConfigurationInput } from "../../common/mail-configurations";
+import { MailConfigurationInputSchema } from "../../common/mail-configurations";
 
 export function MailConfigurationTargets({
   prefix,
diff --git a/modules/companies/src/web/mail/mail-configurations-page.tsx b/modules/companies/src/web/mail/mail-configurations-page.tsx
index ea46fe1..e1c933c 100644
--- a/modules/companies/src/web/mail/mail-configurations-page.tsx
+++ b/modules/companies/src/web/mail/mail-configurations-page.tsx
@@ -7,7 +7,6 @@ import {
   EntityStatus,
   EntityTable,
 } from "@repo/shadcn-ui/components/entity-list";
-import { FormDialog } from "@repo/shadcn-ui/components/form-dialog";
 import { useQuery } from "@tanstack/react-query";
 import { useState } from "react";
 import { useTranslation } from "react-i18next";
@@ -17,7 +16,8 @@ import type { MailConfigurationDTO } from "../../common/mail-configurations";
 import { profileApi, profileKeys } from "../profiles/work-profile-api";
 
 import { mailApi, mailKeys } from "./mail-api";
-import { MailConfigurationForm } from "./mail-configuration-form";
+import { MailConfigurationEditorDialog } from "./mail-configuration-editor-dialog";
+import { MailConfigurationHistoryDialog } from "./mail-configuration-history-dialog";
 import { MailFeedback } from "./mail-feedback";
 import { mailboxApi, mailboxKeys } from "./mailbox-api";
 export function MailConfigurationsPage({
@@ -198,61 +198,20 @@ export function MailConfigurationsPage({
         />
       )}
       {editor && (
-        <FormDialog
-          cancelLabel={t("cancel")}
-          formActions
-          onOpenChange={(open) => {
-            if (!open) {
-              setEditor(undefined);
-            }
-          }}
-          open
-          title={t(edited ? "mail.edit" : "mail.new")}
-          wide
-        >
-          <MailConfigurationForm
-            company={company}
-            configuration={edited}
-            csrfToken={csrfToken}
-            initialProfileId={initialProfileId ?? ""}
-            onSaved={() => setEditor(undefined)}
-          />
-        </FormDialog>
+        <MailConfigurationEditorDialog
+          company={company}
+          configuration={edited}
+          csrfToken={csrfToken}
+          initialProfileId={initialProfileId ?? ""}
+          onClose={() => setEditor(undefined)}
+        />
       )}
       {viewed && (
-        <FormDialog
-          cancelLabel={t("close")}
-          onOpenChange={(open) => {
-            if (!open) {
-              setView(undefined);
-            }
-          }}
-          open
-          title={t("mail.history")}
-          wide
-        >
-          <ol className="space-y-3">
-            {[...viewed.history].reverse().map((revision) => (
-              <li className="rounded-md border p-3 text-sm" key={revision.id}>
-                <p className="font-medium">
-                  {new Intl.DateTimeFormat(i18n.language, {
-                    dateStyle: "medium",
-                    timeStyle: "short",
-                  }).format(new Date(revision.recordedAt))}{" "}
-                  · {revision.actorName}
-                </p>
-                <p>
-                  {revision.values.address} · {t(`mail.${revision.values.method}`)} ·{" "}
-                  {t(`mail.${revision.values.state}`)}
-                </p>
-                <p>{target(revision.values)}</p>
-                {revision.values.notes && (
-                  <p className="mt-2 whitespace-pre-wrap">{revision.values.notes}</p>
-                )}
-              </li>
-            ))}
-          </ol>
-        </FormDialog>
+        <MailConfigurationHistoryDialog
+          configuration={viewed}
+          onClose={() => setView(undefined)}
+          target={target}
+        />
       )}
     </div>
   );
diff --git a/modules/companies/src/web/mail/mailbox-api.ts b/modules/companies/src/web/mail/mailbox-api.ts
index dd337e9..ca5c738 100644
--- a/modules/companies/src/web/mail/mailbox-api.ts
+++ b/modules/companies/src/web/mail/mailbox-api.ts
@@ -1,10 +1,7 @@
 import { z } from "zod/v4";
 
-import {
-  type MailboxInput,
-  type MailboxUseInput,
-  MailboxesResponseSchema,
-} from "../../common/mailboxes";
+import type { MailboxInput, MailboxUseInput } from "../../common/mailboxes";
+import { MailboxesResponseSchema } from "../../common/mailboxes";
 
 import { MailApiError } from "./mail-api";
 export const mailboxKeys = { company: (id: string) => ["mailboxes", id] };
diff --git a/modules/companies/src/web/mail/mailbox-create-dialog.tsx b/modules/companies/src/web/mail/mailbox-create-dialog.tsx
new file mode 100644
index 0000000..b81f2d3
--- /dev/null
+++ b/modules/companies/src/web/mail/mailbox-create-dialog.tsx
@@ -0,0 +1,37 @@
+import { FormDialog } from "@repo/shadcn-ui/components/form-dialog";
+import { useTranslation } from "react-i18next";
+
+import type { CompanyDTO } from "../../common";
+
+import { MailboxForm } from "./mailbox-form";
+
+export function MailboxCreateDialog({
+  company,
+  csrfToken,
+  onSaved,
+  onOpenChange,
+}: {
+  company: CompanyDTO;
+  csrfToken: string;
+  onSaved: (id: string) => void;
+  onOpenChange: (open: boolean) => void;
+}) {
+  const { t } = useTranslation("companies");
+
+  return (
+    <FormDialog
+      cancelLabel={t("cancel")}
+      formActions
+      onOpenChange={onOpenChange}
+      open
+      title={t("mailbox.new")}
+    >
+      <MailboxForm
+        allowQuickCreate={false}
+        company={company}
+        csrfToken={csrfToken}
+        onSaved={onSaved}
+      />
+    </FormDialog>
+  );
+}
diff --git a/modules/companies/src/web/mail/mailbox-relations.tsx b/modules/companies/src/web/mail/mailbox-relations.tsx
index 500fdfd..33cc08f 100644
--- a/modules/companies/src/web/mail/mailbox-relations.tsx
+++ b/modules/companies/src/web/mail/mailbox-relations.tsx
@@ -1,5 +1,4 @@
 import { Button } from "@repo/shadcn-ui/components/button";
-import { FormDialog } from "@repo/shadcn-ui/components/form-dialog";
 import { useQuery } from "@tanstack/react-query";
 import { useState } from "react";
 import { useTranslation } from "react-i18next";
@@ -8,7 +7,7 @@ import type { CompanyDTO } from "../../common";
 
 import { MailFeedback } from "./mail-feedback";
 import { mailboxApi, mailboxKeys } from "./mailbox-api";
-import { MailboxUseForm } from "./mailbox-use-form";
+import { MailboxUseEditorDialog } from "./mailbox-use-editor-dialog";
 export function MailboxRelations({
   company,
   csrfToken,
@@ -52,26 +51,18 @@ export function MailboxRelations({
         ))}
       </ul>
       {editor && (
-        <FormDialog
-          cancelLabel={t("cancel")}
-          formActions
+        <MailboxUseEditorDialog
+          company={company}
+          csrfToken={csrfToken}
+          mailboxId={mailboxId}
           onOpenChange={(open) => {
             if (!open) {
               setEditor(undefined);
             }
           }}
-          open
-          title={t(edited ? "mailbox.closeUse" : "mailbox.linkPerson")}
-        >
-          <MailboxUseForm
-            allowQuickCreate={false}
-            company={company}
-            csrfToken={csrfToken}
-            initialMailboxId={mailboxId}
-            onSaved={() => setEditor(undefined)}
-            use={edited}
-          />
-        </FormDialog>
+          onSaved={() => setEditor(undefined)}
+          use={edited}
+        />
       )}
     </section>
   );
diff --git a/modules/companies/src/web/mail/mailbox-use-editor-dialog.tsx b/modules/companies/src/web/mail/mailbox-use-editor-dialog.tsx
new file mode 100644
index 0000000..3893f76
--- /dev/null
+++ b/modules/companies/src/web/mail/mailbox-use-editor-dialog.tsx
@@ -0,0 +1,44 @@
+import { FormDialog } from "@repo/shadcn-ui/components/form-dialog";
+import type { ComponentProps } from "react";
+import { useTranslation } from "react-i18next";
+
+import type { CompanyDTO } from "../../common";
+
+import { MailboxUseForm } from "./mailbox-use-form";
+
+export function MailboxUseEditorDialog({
+  use,
+  company,
+  csrfToken,
+  mailboxId,
+  onSaved,
+  onOpenChange,
+}: {
+  use: ComponentProps<typeof MailboxUseForm>["use"];
+  company: CompanyDTO;
+  csrfToken: string;
+  mailboxId: string;
+  onSaved: () => void;
+  onOpenChange: (open: boolean) => void;
+}) {
+  const { t } = useTranslation("companies");
+
+  return (
+    <FormDialog
+      cancelLabel={t("cancel")}
+      formActions
+      onOpenChange={onOpenChange}
+      open
+      title={t(use ? "mailbox.closeUse" : "mailbox.linkPerson")}
+    >
+      <MailboxUseForm
+        allowQuickCreate={false}
+        company={company}
+        csrfToken={csrfToken}
+        initialMailboxId={mailboxId}
+        onSaved={onSaved}
+        use={use}
+      />
+    </FormDialog>
+  );
+}
diff --git a/modules/companies/src/web/mail/mailbox-use-form.tsx b/modules/companies/src/web/mail/mailbox-use-form.tsx
index 2a5a412..443cd4f 100644
--- a/modules/companies/src/web/mail/mailbox-use-form.tsx
+++ b/modules/companies/src/web/mail/mailbox-use-form.tsx
@@ -1,7 +1,7 @@
 import { zodResolver } from "@hookform/resolvers/zod";
 import { Button } from "@repo/shadcn-ui/components/button";
 import { ContextHelp } from "@repo/shadcn-ui/components/context-help";
-import { FormActions, FormDialog } from "@repo/shadcn-ui/components/form-dialog";
+import { FormActions } from "@repo/shadcn-ui/components/form-dialog";
 import { Input } from "@repo/shadcn-ui/components/input";
 import { Label } from "@repo/shadcn-ui/components/label";
 import { SelectWithAction } from "@repo/shadcn-ui/components/select-with-action";
@@ -11,17 +11,14 @@ import { useForm } from "react-hook-form";
 import { useTranslation } from "react-i18next";
 
 import type { CompanyDTO } from "../../common";
-import {
-  type MailboxUseDTO,
-  type MailboxUseInput,
-  MailboxUseInputSchema,
-} from "../../common/mailboxes";
-import { PersonForm } from "../components/person-form";
+import type { MailboxUseDTO, MailboxUseInput } from "../../common/mailboxes";
+import { MailboxUseInputSchema } from "../../common/mailboxes";
+import { PersonEditorDialog } from "../components/person-editor-dialog";
 
 import { mailKeys } from "./mail-api";
 import { MailFeedback } from "./mail-feedback";
 import { mailboxApi, mailboxKeys } from "./mailbox-api";
-import { MailboxForm } from "./mailbox-form";
+import { MailboxCreateDialog } from "./mailbox-create-dialog";
 
 export function MailboxUseForm({
   company,
@@ -159,54 +156,40 @@ export function MailboxUseForm({
         </FormActions>
       </form>
       {quick === "person" && (
-        <FormDialog
-          cancelLabel={t("cancel")}
-          formActions
+        <PersonEditorDialog
+          companyId={company.id}
+          csrfToken={csrfToken}
           onOpenChange={(open) => {
             if (!open) {
               setQuick(undefined);
             }
           }}
+          onSaved={(id) => {
+            if (mounted.current) {
+              form.setValue("personId", id);
+              setQuick(undefined);
+            }
+          }}
           open
-          title={t("newPerson")}
-        >
-          <PersonForm
-            companyId={company.id}
-            csrfToken={csrfToken}
-            onSaved={(id) => {
-              if (mounted.current) {
-                form.setValue("personId", id);
-                setQuick(undefined);
-              }
-            }}
-            requireActive
-          />
-        </FormDialog>
+          requireActive
+        />
       )}
       {quick === "mailbox" && (
-        <FormDialog
-          cancelLabel={t("cancel")}
-          formActions
+        <MailboxCreateDialog
+          company={company}
+          csrfToken={csrfToken}
           onOpenChange={(open) => {
             if (!open) {
               setQuick(undefined);
             }
           }}
-          open
-          title={t("mailbox.new")}
-        >
-          <MailboxForm
-            allowQuickCreate={false}
-            company={company}
-            csrfToken={csrfToken}
-            onSaved={(id) => {
-              if (mounted.current) {
-                form.setValue("mailboxId", id);
-                setQuick(undefined);
-              }
-            }}
-          />
-        </FormDialog>
+          onSaved={(id) => {
+            if (mounted.current) {
+              form.setValue("mailboxId", id);
+              setQuick(undefined);
+            }
+          }}
+        />
       )}
     </>
   );
diff --git a/modules/companies/src/web/printers/printer-api.ts b/modules/companies/src/web/printers/printer-api.ts
index 7e542cf..8cdd3bd 100644
--- a/modules/companies/src/web/printers/printer-api.ts
+++ b/modules/companies/src/web/printers/printer-api.ts
@@ -1,7 +1,7 @@
 import { z } from "zod/v4";
 
+import type { PrinterConfigurationInput } from "../../common/printer-configurations";
 import {
-  type PrinterConfigurationInput,
   PrinterConfigurationResponseSchema,
   PrinterConfigurationsResponseSchema,
 } from "../../common/printer-configurations";
diff --git a/modules/companies/src/web/printers/printer-configuration-editor-dialog.tsx b/modules/companies/src/web/printers/printer-configuration-editor-dialog.tsx
new file mode 100644
index 0000000..c60dbea
--- /dev/null
+++ b/modules/companies/src/web/printers/printer-configuration-editor-dialog.tsx
@@ -0,0 +1,46 @@
+import { FormDialog } from "@repo/shadcn-ui/components/form-dialog";
+import type { ComponentProps } from "react";
+import { useTranslation } from "react-i18next";
+
+import type { CompanyDTO } from "../../common";
+
+import { PrinterConfigurationForm } from "./printer-configuration-form";
+
+export function PrinterConfigurationEditorDialog({
+  configuration,
+  company,
+  csrfToken,
+  initialProfileId,
+  onClose,
+}: {
+  configuration: ComponentProps<typeof PrinterConfigurationForm>["configuration"];
+  company: CompanyDTO;
+  csrfToken: string;
+  initialProfileId: ComponentProps<typeof PrinterConfigurationForm>["initialProfileId"];
+  onClose: () => void;
+}) {
+  const { t } = useTranslation("companies");
+
+  return (
+    <FormDialog
+      cancelLabel={t("cancel")}
+      formActions
+      onOpenChange={(open) => {
+        if (!open) {
+          onClose();
+        }
+      }}
+      open
+      title={t(configuration ? "printers.edit" : "printers.new")}
+      wide
+    >
+      <PrinterConfigurationForm
+        company={company}
+        configuration={configuration}
+        csrfToken={csrfToken}
+        initialProfileId={initialProfileId ?? ""}
+        onSaved={() => onClose()}
+      />
+    </FormDialog>
+  );
+}
diff --git a/modules/companies/src/web/printers/printer-configuration-form.tsx b/modules/companies/src/web/printers/printer-configuration-form.tsx
index e92fe95..75e0c6d 100644
--- a/modules/companies/src/web/printers/printer-configuration-form.tsx
+++ b/modules/companies/src/web/printers/printer-configuration-form.tsx
@@ -3,7 +3,7 @@ import { inventoryApi, inventoryKeys } from "@metis/assets/client";
 import type { AssetDTO } from "@metis/assets/common";
 import { Button } from "@repo/shadcn-ui/components/button";
 import { ContextHelp } from "@repo/shadcn-ui/components/context-help";
-import { FormActions, FormDialog } from "@repo/shadcn-ui/components/form-dialog";
+import { FormActions } from "@repo/shadcn-ui/components/form-dialog";
 import { Label } from "@repo/shadcn-ui/components/label";
 import { SelectWithAction } from "@repo/shadcn-ui/components/select-with-action";
 import { Textarea } from "@repo/shadcn-ui/components/textarea";
@@ -13,18 +13,20 @@ import { useForm } from "react-hook-form";
 import { useTranslation } from "react-i18next";
 
 import type { CompanyDTO, WorkProfileDTO } from "../../common";
+import type {
+  PrinterConfigurationDTO,
+  PrinterConfigurationInput,
+} from "../../common/printer-configurations";
 import {
   PRINTER_STATE_TRANSITIONS,
-  type PrinterConfigurationDTO,
-  type PrinterConfigurationInput,
   PrinterConfigurationInputSchema,
 } from "../../common/printer-configurations";
 import { ConfigurationQuickEditor } from "../components/configuration-quick-editor";
 import { profileApi, profileKeys } from "../profiles/work-profile-api";
-import { WorkProfileForm } from "../profiles/work-profile-form";
 
 import { printerApi, printerKeys } from "./printer-api";
 import { PrinterFeedback } from "./printer-feedback";
+import { PrinterProfileCreateDialog } from "./printer-profile-create-dialog";
 export function PrinterConfigurationForm({
   company,
   csrfToken,
@@ -206,31 +208,22 @@ export function PrinterConfigurationForm({
         </FormActions>
       </form>
       {quick === "profile" && (
-        <FormDialog
-          cancelLabel={t("cancel")}
-          formActions
+        <PrinterProfileCreateDialog
+          company={company}
+          csrfToken={csrfToken}
           onOpenChange={(open) => {
             if (!open) {
               setQuick(undefined);
             }
           }}
-          open
-          title={t("profiles.new")}
-          wide
-        >
-          <WorkProfileForm
-            allowQuickCreate={false}
-            company={company}
-            csrfToken={csrfToken}
-            onSaved={(id) => {
-              if (mounted.current) {
-                form.setValue("profileId", id);
-                form.setValue("printerId", "");
-                setQuick(undefined);
-              }
-            }}
-          />
-        </FormDialog>
+          onSaved={(id) => {
+            if (mounted.current) {
+              form.setValue("profileId", id);
+              form.setValue("printerId", "");
+              setQuick(undefined);
+            }
+          }}
+        />
       )}
       {quick === "printer" && (
         <ConfigurationQuickEditor
diff --git a/modules/companies/src/web/printers/printer-configurations-page.tsx b/modules/companies/src/web/printers/printer-configurations-page.tsx
index 2d61f33..1bd8292 100644
--- a/modules/companies/src/web/printers/printer-configurations-page.tsx
+++ b/modules/companies/src/web/printers/printer-configurations-page.tsx
@@ -7,7 +7,6 @@ import {
   EntityStatus,
   EntityTable,
 } from "@repo/shadcn-ui/components/entity-list";
-import { FormDialog } from "@repo/shadcn-ui/components/form-dialog";
 import { useQuery } from "@tanstack/react-query";
 import { useState } from "react";
 import { useTranslation } from "react-i18next";
@@ -16,9 +15,9 @@ import type { CompanyDTO } from "../../common";
 import { profileApi, profileKeys } from "../profiles/work-profile-api";
 
 import { printerApi, printerKeys } from "./printer-api";
-import { PrinterConfigurationForm } from "./printer-configuration-form";
+import { PrinterConfigurationEditorDialog } from "./printer-configuration-editor-dialog";
 import { PrinterFeedback } from "./printer-feedback";
-import { PrinterHistory } from "./printer-history";
+import { PrinterHistoryDialog } from "./printer-history-dialog";
 
 export function PrinterConfigurationsPage({
   company,
@@ -178,42 +177,15 @@ export function PrinterConfigurationsPage({
         />
       )}
       {editor && (
-        <FormDialog
-          cancelLabel={t("cancel")}
-          formActions
-          onOpenChange={(open) => {
-            if (!open) {
-              setEditor(undefined);
-            }
-          }}
-          open
-          title={t(edited ? "printers.edit" : "printers.new")}
-          wide
-        >
-          <PrinterConfigurationForm
-            company={company}
-            configuration={edited}
-            csrfToken={csrfToken}
-            initialProfileId={initialProfileId ?? ""}
-            onSaved={() => setEditor(undefined)}
-          />
-        </FormDialog>
-      )}
-      {viewed && (
-        <FormDialog
-          cancelLabel={t("close")}
-          onOpenChange={(open) => {
-            if (!open) {
-              setView(undefined);
-            }
-          }}
-          open
-          title={t("mail.history")}
-          wide
-        >
-          <PrinterHistory configuration={viewed} />
-        </FormDialog>
+        <PrinterConfigurationEditorDialog
+          company={company}
+          configuration={edited}
+          csrfToken={csrfToken}
+          initialProfileId={initialProfileId ?? ""}
+          onClose={() => setEditor(undefined)}
+        />
       )}
+      {viewed && <PrinterHistoryDialog configuration={viewed} onClose={() => setView(undefined)} />}
     </div>
   );
 }
diff --git a/modules/companies/src/web/printers/printer-history-dialog.tsx b/modules/companies/src/web/printers/printer-history-dialog.tsx
new file mode 100644
index 0000000..cb4fe03
--- /dev/null
+++ b/modules/companies/src/web/printers/printer-history-dialog.tsx
@@ -0,0 +1,48 @@
+import { FormDialog } from "@repo/shadcn-ui/components/form-dialog";
+import { useTranslation } from "react-i18next";
+
+import type { PrinterConfigurationDTO } from "../../common";
+
+export function PrinterHistoryDialog({
+  configuration,
+  onClose,
+}: {
+  onClose: () => void;
+  configuration: PrinterConfigurationDTO;
+}) {
+  const { t, i18n } = useTranslation("companies");
+  return (
+    <FormDialog
+      cancelLabel={t("close")}
+      onOpenChange={(open) => {
+        if (!open) {
+          onClose();
+        }
+      }}
+      open
+      title={t("mail.history")}
+      wide
+    >
+      <ol className="space-y-3">
+        {[...configuration.history].reverse().map((revision) => (
+          <li className="rounded-md border p-3 text-sm" key={revision.id}>
+            <p className="font-medium">
+              {new Intl.DateTimeFormat(i18n.language, {
+                dateStyle: "medium",
+                timeStyle: "short",
+              }).format(new Date(revision.recordedAt))}{" "}
+              · {revision.actorName}
+            </p>
+            <p>
+              {t(`printers.${revision.values.connection}`)} · {t(`mail.${revision.values.state}`)}
+            </p>
+            <p>{t(revision.values.isDefault ? "printers.default" : "printers.notDefault")}</p>
+            {revision.values.notes && (
+              <p className="mt-2 whitespace-pre-wrap">{revision.values.notes}</p>
+            )}
+          </li>
+        ))}
+      </ol>
+    </FormDialog>
+  );
+}
diff --git a/modules/companies/src/web/printers/printer-history.tsx b/modules/companies/src/web/printers/printer-history.tsx
deleted file mode 100644
index 406463e..0000000
--- a/modules/companies/src/web/printers/printer-history.tsx
+++ /dev/null
@@ -1,29 +0,0 @@
-import { useTranslation } from "react-i18next";
-
-import type { PrinterConfigurationDTO } from "../../common";
-
-export function PrinterHistory({ configuration }: { configuration: PrinterConfigurationDTO }) {
-  const { t, i18n } = useTranslation("companies");
-  return (
-    <ol className="space-y-3">
-      {[...configuration.history].reverse().map((revision) => (
-        <li className="rounded-md border p-3 text-sm" key={revision.id}>
-          <p className="font-medium">
-            {new Intl.DateTimeFormat(i18n.language, {
-              dateStyle: "medium",
-              timeStyle: "short",
-            }).format(new Date(revision.recordedAt))}{" "}
-            · {revision.actorName}
-          </p>
-          <p>
-            {t(`printers.${revision.values.connection}`)} · {t(`mail.${revision.values.state}`)}
-          </p>
-          <p>{t(revision.values.isDefault ? "printers.default" : "printers.notDefault")}</p>
-          {revision.values.notes && (
-            <p className="mt-2 whitespace-pre-wrap">{revision.values.notes}</p>
-          )}
-        </li>
-      ))}
-    </ol>
-  );
-}
diff --git a/modules/companies/src/web/printers/printer-profile-create-dialog.tsx b/modules/companies/src/web/printers/printer-profile-create-dialog.tsx
new file mode 100644
index 0000000..8f8c245
--- /dev/null
+++ b/modules/companies/src/web/printers/printer-profile-create-dialog.tsx
@@ -0,0 +1,37 @@
+import { FormDialog } from "@repo/shadcn-ui/components/form-dialog";
+import { useTranslation } from "react-i18next";
+
+import type { CompanyDTO } from "../../common";
+import { WorkProfileForm } from "../profiles/work-profile-form";
+
+export function PrinterProfileCreateDialog({
+  company,
+  csrfToken,
+  onSaved,
+  onOpenChange,
+}: {
+  company: CompanyDTO;
+  csrfToken: string;
+  onSaved: (id: string) => void;
+  onOpenChange: (open: boolean) => void;
+}) {
+  const { t } = useTranslation("companies");
+
+  return (
+    <FormDialog
+      cancelLabel={t("cancel")}
+      formActions
+      onOpenChange={onOpenChange}
+      open
+      title={t("profiles.new")}
+      wide
+    >
+      <WorkProfileForm
+        allowQuickCreate={false}
+        company={company}
+        csrfToken={csrfToken}
+        onSaved={onSaved}
+      />
+    </FormDialog>
+  );
+}
diff --git a/modules/companies/src/web/processes/process-api.ts b/modules/companies/src/web/processes/process-api.ts
index 0bf927d..3d01120 100644
--- a/modules/companies/src/web/processes/process-api.ts
+++ b/modules/companies/src/web/processes/process-api.ts
@@ -1,14 +1,16 @@
 import { z } from "zod/v4";
 
+import type {
+  ProcessTemplateInput,
+  StartProcessInput,
+  UpdateProcessInput,
+} from "../../common/processes";
 import {
   ProcessResponseSchema,
   ProcessReviewResponseSchema,
-  type ProcessTemplateInput,
   ProcessTemplateResponseSchema,
   ProcessTemplatesResponseSchema,
   ProcessesResponseSchema,
-  type StartProcessInput,
-  type UpdateProcessInput,
 } from "../../common/processes";
 export const processKeys = {
   company: (id: string) => ["person-processes", id],
diff --git a/modules/companies/src/web/processes/process-detail.tsx b/modules/companies/src/web/processes/process-detail.tsx
index 27fb106..1febe98 100644
--- a/modules/companies/src/web/processes/process-detail.tsx
+++ b/modules/companies/src/web/processes/process-detail.tsx
@@ -1,6 +1,5 @@
 import { Button } from "@repo/shadcn-ui/components/button";
 import { Card, CardContent } from "@repo/shadcn-ui/components/card";
-import { FormDialog } from "@repo/shadcn-ui/components/form-dialog";
 import { useMutation, useQueryClient } from "@tanstack/react-query";
 import { useState } from "react";
 import { useTranslation } from "react-i18next";
@@ -8,7 +7,7 @@ import { useTranslation } from "react-i18next";
 import type { PersonProcessDTO } from "../../common/processes";
 
 import { processApi, processKeys } from "./process-api";
-import { ProcessEditForm } from "./process-edit-form";
+import { ProcessEditDialog } from "./process-edit-dialog";
 import { ProcessFeedback } from "./process-feedback";
 import { processReferenceTitle, processTaskTitle } from "./process-labels";
 export function ProcessDetail({
@@ -137,18 +136,13 @@ export function ProcessDetail({
           ))}
         </ol>
       </details>
-      <FormDialog
-        cancelLabel={t("cancel")}
-        formActions
+      <ProcessEditDialog
+        csrfToken={csrfToken}
         onOpenChange={setEdit}
+        onSaved={() => setEdit(false)}
         open={edit}
-        title={t("processes.update")}
-        wide
-      >
-        {edit && (
-          <ProcessEditForm csrfToken={csrfToken} onSaved={() => setEdit(false)} process={process} />
-        )}
-      </FormDialog>
+        process={process}
+      />
     </div>
   );
 }
diff --git a/modules/companies/src/web/processes/process-edit-dialog.tsx b/modules/companies/src/web/processes/process-edit-dialog.tsx
new file mode 100644
index 0000000..9c46746
--- /dev/null
+++ b/modules/companies/src/web/processes/process-edit-dialog.tsx
@@ -0,0 +1,34 @@
+import { FormDialog } from "@repo/shadcn-ui/components/form-dialog";
+import type { ComponentProps } from "react";
+import { useTranslation } from "react-i18next";
+
+import { ProcessEditForm } from "./process-edit-form";
+
+export function ProcessEditDialog({
+  open,
+  process,
+  csrfToken,
+  onSaved,
+  onOpenChange,
+}: {
+  open: boolean;
+  process: ComponentProps<typeof ProcessEditForm>["process"];
+  csrfToken: string;
+  onSaved: () => void;
+  onOpenChange: (open: boolean) => void;
+}) {
+  const { t } = useTranslation("companies");
+
+  return (
+    <FormDialog
+      cancelLabel={t("cancel")}
+      formActions
+      onOpenChange={onOpenChange}
+      open={open}
+      title={t("processes.update")}
+      wide
+    >
+      {open && <ProcessEditForm csrfToken={csrfToken} onSaved={onSaved} process={process} />}
+    </FormDialog>
+  );
+}
diff --git a/modules/companies/src/web/processes/process-edit-form.tsx b/modules/companies/src/web/processes/process-edit-form.tsx
index 5b015e0..1113415 100644
--- a/modules/companies/src/web/processes/process-edit-form.tsx
+++ b/modules/companies/src/web/processes/process-edit-form.tsx
@@ -10,11 +10,8 @@ import { useEffect, useId, useRef } from "react";
 import { useForm } from "react-hook-form";
 import { useTranslation } from "react-i18next";
 
-import {
-  type PersonProcessDTO,
-  type UpdateProcessInput,
-  UpdateProcessInputSchema,
-} from "../../common/processes";
+import type { PersonProcessDTO, UpdateProcessInput } from "../../common/processes";
+import { UpdateProcessInputSchema } from "../../common/processes";
 
 import { processApi, processKeys } from "./process-api";
 import { ProcessFeedback } from "./process-feedback";
diff --git a/modules/companies/src/web/processes/process-quick-create-dialog.tsx b/modules/companies/src/web/processes/process-quick-create-dialog.tsx
new file mode 100644
index 0000000..5c3ff1e
--- /dev/null
+++ b/modules/companies/src/web/processes/process-quick-create-dialog.tsx
@@ -0,0 +1,39 @@
+import { FormDialog } from "@repo/shadcn-ui/components/form-dialog";
+import { useTranslation } from "react-i18next";
+
+import { PersonForm } from "../components/person-form";
+
+import { ProcessTemplateForm } from "./process-template-form";
+
+export function ProcessQuickCreateDialog({
+  quick,
+  companyId,
+  csrfToken,
+  onCreated,
+  onOpenChange,
+}: {
+  quick: "person" | "template";
+  companyId: string;
+  csrfToken: string;
+  onCreated: (id: string) => void;
+  onOpenChange: (open: boolean) => void;
+}) {
+  const { t } = useTranslation("companies");
+
+  return (
+    <FormDialog
+      cancelLabel={t("cancel")}
+      formActions
+      onOpenChange={onOpenChange}
+      open
+      title={t(quick === "person" ? "newPerson" : "processes.newTemplate")}
+      wide
+    >
+      {quick === "person" ? (
+        <PersonForm companyId={companyId} csrfToken={csrfToken} onSaved={onCreated} />
+      ) : (
+        <ProcessTemplateForm csrfToken={csrfToken} onSaved={onCreated} />
+      )}
+    </FormDialog>
+  );
+}
diff --git a/modules/companies/src/web/processes/process-start-dialog.tsx b/modules/companies/src/web/processes/process-start-dialog.tsx
new file mode 100644
index 0000000..2d4f1c6
--- /dev/null
+++ b/modules/companies/src/web/processes/process-start-dialog.tsx
@@ -0,0 +1,36 @@
+import { FormDialog } from "@repo/shadcn-ui/components/form-dialog";
+import type { ComponentProps } from "react";
+import { useTranslation } from "react-i18next";
+
+import type { CompanyDTO } from "../../common";
+
+import { ProcessStartForm } from "./process-start-form";
+
+export function ProcessStartDialog({
+  open,
+  company,
+  csrfToken,
+  onSaved,
+  onOpenChange,
+}: {
+  open: boolean;
+  company: CompanyDTO;
+  csrfToken: string;
+  onSaved: ComponentProps<typeof ProcessStartForm>["onSaved"];
+  onOpenChange: (open: boolean) => void;
+}) {
+  const { t } = useTranslation("companies");
+
+  return (
+    <FormDialog
+      cancelLabel={t("cancel")}
+      formActions
+      onOpenChange={onOpenChange}
+      open={open}
+      title={t("processes.new")}
+      wide
+    >
+      {open && <ProcessStartForm company={company} csrfToken={csrfToken} onSaved={onSaved} />}
+    </FormDialog>
+  );
+}
diff --git a/modules/companies/src/web/processes/process-start-form.tsx b/modules/companies/src/web/processes/process-start-form.tsx
index c63d411..ebf7d97 100644
--- a/modules/companies/src/web/processes/process-start-form.tsx
+++ b/modules/companies/src/web/processes/process-start-form.tsx
@@ -1,6 +1,6 @@
 import { zodResolver } from "@hookform/resolvers/zod";
 import { Button } from "@repo/shadcn-ui/components/button";
-import { FormActions, FormDialog } from "@repo/shadcn-ui/components/form-dialog";
+import { FormActions } from "@repo/shadcn-ui/components/form-dialog";
 import { Input } from "@repo/shadcn-ui/components/input";
 import { Label } from "@repo/shadcn-ui/components/label";
 import { SelectWithAction } from "@repo/shadcn-ui/components/select-with-action";
@@ -11,13 +11,13 @@ import { useForm } from "react-hook-form";
 import { useTranslation } from "react-i18next";
 
 import type { CompanyDTO } from "../../common";
-import { type StartProcessInput, StartProcessInputSchema } from "../../common/processes";
-import { PersonForm } from "../components/person-form";
+import type { StartProcessInput } from "../../common/processes";
+import { StartProcessInputSchema } from "../../common/processes";
 
 import { processApi, processKeys } from "./process-api";
 import { ProcessFeedback } from "./process-feedback";
 import { ProcessHelp } from "./process-help";
-import { ProcessTemplateForm } from "./process-template-form";
+import { ProcessQuickCreateDialog } from "./process-quick-create-dialog";
 export function ProcessStartForm({
   company,
   csrfToken,
@@ -150,24 +150,17 @@ export function ProcessStartForm({
         </FormActions>
       </form>
       {quick && (
-        <FormDialog
-          cancelLabel={t("cancel")}
-          formActions
+        <ProcessQuickCreateDialog
+          companyId={company.id}
+          csrfToken={csrfToken}
+          onCreated={onCreated}
           onOpenChange={(open) => {
             if (!open) {
               setQuick(undefined);
             }
           }}
-          open
-          title={t(quick === "person" ? "newPerson" : "processes.newTemplate")}
-          wide
-        >
-          {quick === "person" ? (
-            <PersonForm companyId={company.id} csrfToken={csrfToken} onSaved={onCreated} />
-          ) : (
-            <ProcessTemplateForm csrfToken={csrfToken} onSaved={onCreated} />
-          )}
-        </FormDialog>
+          quick={quick}
+        />
       )}
     </>
   );
diff --git a/modules/companies/src/web/processes/process-task-field.tsx b/modules/companies/src/web/processes/process-task-field.tsx
index b89f331..3d3ccf2 100644
--- a/modules/companies/src/web/processes/process-task-field.tsx
+++ b/modules/companies/src/web/processes/process-task-field.tsx
@@ -5,11 +5,8 @@ import { useId } from "react";
 import type { UseFormReturn } from "react-hook-form";
 import { useTranslation } from "react-i18next";
 
-import {
-  type PersonProcessDTO,
-  ProcessValuesSchema,
-  type UpdateProcessInput,
-} from "../../common/processes";
+import type { PersonProcessDTO, UpdateProcessInput } from "../../common/processes";
+import { ProcessValuesSchema } from "../../common/processes";
 
 import { processTaskTitle } from "./process-labels";
 export function ProcessTaskField({
diff --git a/modules/companies/src/web/processes/process-template-editor-dialog.tsx b/modules/companies/src/web/processes/process-template-editor-dialog.tsx
new file mode 100644
index 0000000..758bc2d
--- /dev/null
+++ b/modules/companies/src/web/processes/process-template-editor-dialog.tsx
@@ -0,0 +1,50 @@
+import { FormDialog } from "@repo/shadcn-ui/components/form-dialog";
+import type { ComponentProps } from "react";
+import { useTranslation } from "react-i18next";
+
+import { ProcessTemplateForm } from "./process-template-form";
+
+export function ProcessTemplateEditorDialog({
+  editor,
+  copy,
+  selected,
+  copied,
+  csrfToken,
+  onSaved,
+  onOpenChange,
+}: {
+  editor: string | undefined;
+  copy: string | undefined;
+  selected: ComponentProps<typeof ProcessTemplateForm>["template"];
+  copied: ComponentProps<typeof ProcessTemplateForm>["template"];
+  csrfToken: string;
+  onSaved: () => void;
+  onOpenChange: (open: boolean) => void;
+}) {
+  const { t } = useTranslation("companies");
+
+  return (
+    <FormDialog
+      cancelLabel={t("cancel")}
+      formActions
+      onOpenChange={onOpenChange}
+      open={Boolean(editor)}
+      title={t(selected ? "processes.editTemplate" : "processes.newTemplate")}
+      wide
+    >
+      {editor && (
+        <ProcessTemplateForm
+          csrfToken={csrfToken}
+          initialValues={
+            copied
+              ? { ...copied.values, name: `${t("processes.copyOf")} ${copied.values.name}` }
+              : undefined
+          }
+          key={editor + (copy ?? "")}
+          onSaved={onSaved}
+          template={selected}
+        />
+      )}
+    </FormDialog>
+  );
+}
diff --git a/modules/companies/src/web/processes/process-template-form.tsx b/modules/companies/src/web/processes/process-template-form.tsx
index f5ebe2d..dadbcb2 100644
--- a/modules/companies/src/web/processes/process-template-form.tsx
+++ b/modules/companies/src/web/processes/process-template-form.tsx
@@ -12,11 +12,8 @@ import { useForm } from "react-hook-form";
 import { useTranslation } from "react-i18next";
 import { z } from "zod/v4";
 
-import {
-  type ProcessTemplateDTO,
-  type ProcessTemplateInput,
-  ProcessTemplateInputSchema,
-} from "../../common/processes";
+import type { ProcessTemplateDTO, ProcessTemplateInput } from "../../common/processes";
+import { ProcessTemplateInputSchema } from "../../common/processes";
 
 import { processApi, processKeys } from "./process-api";
 import { ProcessFeedback } from "./process-feedback";
diff --git a/modules/companies/src/web/processes/process-templates-page.tsx b/modules/companies/src/web/processes/process-templates-page.tsx
index 15ecca8..6ca00be 100644
--- a/modules/companies/src/web/processes/process-templates-page.tsx
+++ b/modules/companies/src/web/processes/process-templates-page.tsx
@@ -6,14 +6,13 @@ import {
   EntityStatus,
   EntityTable,
 } from "@repo/shadcn-ui/components/entity-list";
-import { FormDialog } from "@repo/shadcn-ui/components/form-dialog";
 import { useQuery } from "@tanstack/react-query";
 import { useState } from "react";
 import { useTranslation } from "react-i18next";
 
 import { processApi, processKeys } from "./process-api";
 import { ProcessFeedback } from "./process-feedback";
-import { ProcessTemplateForm } from "./process-template-form";
+import { ProcessTemplateEditorDialog } from "./process-template-editor-dialog";
 export function ProcessTemplatesPage({ csrfToken }: { csrfToken: string }) {
   const { t, i18n } = useTranslation("companies");
   const query = useQuery({ queryKey: processKeys.catalog(), queryFn: processApi.catalog });
@@ -148,32 +147,19 @@ export function ProcessTemplatesPage({ csrfToken }: { csrfToken: string }) {
           title={t("processes.templates")}
         />
       )}
-      <FormDialog
-        cancelLabel={t("cancel")}
-        formActions
+      <ProcessTemplateEditorDialog
+        copied={copied}
+        copy={copy}
+        csrfToken={csrfToken}
+        editor={editor}
         onOpenChange={(open) => {
           if (!open) {
             close();
           }
         }}
-        open={Boolean(editor)}
-        title={t(selected ? "processes.editTemplate" : "processes.newTemplate")}
-        wide
-      >
-        {editor && (
-          <ProcessTemplateForm
-            csrfToken={csrfToken}
-            initialValues={
-              copied
-                ? { ...copied.values, name: `${t("processes.copyOf")} ${copied.values.name}` }
-                : undefined
-            }
-            key={editor + (copy ?? "")}
-            onSaved={close}
-            template={selected}
-          />
-        )}
-      </FormDialog>
+        onSaved={close}
+        selected={selected}
+      />
     </div>
   );
 }
diff --git a/modules/companies/src/web/processes/processes-page.tsx b/modules/companies/src/web/processes/processes-page.tsx
index 09eb071..f168704 100644
--- a/modules/companies/src/web/processes/processes-page.tsx
+++ b/modules/companies/src/web/processes/processes-page.tsx
@@ -6,7 +6,6 @@ import {
   EntityStatus,
   EntityTable,
 } from "@repo/shadcn-ui/components/entity-list";
-import { FormDialog } from "@repo/shadcn-ui/components/form-dialog";
 import { useQuery } from "@tanstack/react-query";
 import { useState } from "react";
 import { useTranslation } from "react-i18next";
@@ -16,7 +15,7 @@ import type { CompanyDTO } from "../../common";
 import { processApi, processKeys } from "./process-api";
 import { ProcessDetail } from "./process-detail";
 import { ProcessFeedback } from "./process-feedback";
-import { ProcessStartForm } from "./process-start-form";
+import { ProcessStartDialog } from "./process-start-dialog";
 import { ProcessTemplatesPage } from "./process-templates-page";
 export function ProcessesPage({ company, csrfToken }: { company: CompanyDTO; csrfToken: string }) {
   const { t, i18n } = useTranslation("companies");
@@ -187,25 +186,16 @@ export function ProcessesPage({ company, csrfToken }: { company: CompanyDTO; csr
           </>
         )
       )}
-      <FormDialog
-        cancelLabel={t("cancel")}
-        formActions
+      <ProcessStartDialog
+        company={company}
+        csrfToken={csrfToken}
         onOpenChange={setCreate}
+        onSaved={(id) => {
+          setCreate(false);
+          setSelected(id);
+        }}
         open={create}
-        title={t("processes.new")}
-        wide
-      >
-        {create && (
-          <ProcessStartForm
-            company={company}
-            csrfToken={csrfToken}
-            onSaved={(id) => {
-              setCreate(false);
-              setSelected(id);
-            }}
-          />
-        )}
-      </FormDialog>
+      />
     </div>
   );
 }
diff --git a/modules/companies/src/web/profiles/environment-content.tsx b/modules/companies/src/web/profiles/environment-content.tsx
index ce92b45..6a67a5e 100644
--- a/modules/companies/src/web/profiles/environment-content.tsx
+++ b/modules/companies/src/web/profiles/environment-content.tsx
@@ -13,11 +13,8 @@ import { TeleworkAuthorizationSummary } from "../telework/telework-authorization
 
 import { EnvironmentSection } from "./environment-section";
 import { HardwareCharacteristics } from "./hardware-characteristics";
-import {
-  type EnvironmentSources,
-  type ProfileConfigurationKind,
-  buildEnvironment,
-} from "./work-environment.model";
+import type { EnvironmentSources, ProfileConfigurationKind } from "./work-environment.model";
+import { buildEnvironment } from "./work-environment.model";
 
 export function EnvironmentContent({
   connections,
diff --git a/modules/companies/src/web/profiles/work-environment.test.tsx b/modules/companies/src/web/profiles/work-environment.test.tsx
index ffa091e..01297c7 100644
--- a/modules/companies/src/web/profiles/work-environment.test.tsx
+++ b/modules/companies/src/web/profiles/work-environment.test.tsx
@@ -30,7 +30,8 @@ import { printerKeys } from "../printers/printer-api";
 import { remoteKeys } from "../remote/remote-api";
 import { teleworkKeys } from "../telework/telework-api";
 
-import { type EnvironmentSources, buildEnvironment } from "./work-environment.model";
+import type { EnvironmentSources } from "./work-environment.model";
+import { buildEnvironment } from "./work-environment.model";
 import { WorkEnvironmentPage } from "./work-environment-page";
 import { profileKeys } from "./work-profile-api";
 
diff --git a/modules/companies/src/web/profiles/work-profile-api.ts b/modules/companies/src/web/profiles/work-profile-api.ts
index 6a783a0..fafa770 100644
--- a/modules/companies/src/web/profiles/work-profile-api.ts
+++ b/modules/companies/src/web/profiles/work-profile-api.ts
@@ -1,10 +1,7 @@
 import { z } from "zod/v4";
 
-import {
-  type WorkProfileInput,
-  WorkProfileResponseSchema,
-  WorkProfilesResponseSchema,
-} from "../../common/work-profiles";
+import type { WorkProfileInput } from "../../common/work-profiles";
+import { WorkProfileResponseSchema, WorkProfilesResponseSchema } from "../../common/work-profiles";
 export const profileKeys = { company: (id: string) => ["work-profiles", id] };
 export class WorkProfileApiError extends Error {
   constructor(public readonly code: string) {
diff --git a/modules/companies/src/web/profiles/work-profile-editor-dialog.tsx b/modules/companies/src/web/profiles/work-profile-editor-dialog.tsx
new file mode 100644
index 0000000..ecb3e92
--- /dev/null
+++ b/modules/companies/src/web/profiles/work-profile-editor-dialog.tsx
@@ -0,0 +1,43 @@
+import { FormDialog } from "@repo/shadcn-ui/components/form-dialog";
+import type { ComponentProps } from "react";
+import { useTranslation } from "react-i18next";
+
+import type { CompanyDTO } from "../../common";
+
+import { WorkProfileForm } from "./work-profile-form";
+
+export function WorkProfileEditorDialog({
+  profile,
+  company,
+  csrfToken,
+  onClose,
+}: {
+  profile: ComponentProps<typeof WorkProfileForm>["profile"];
+  company: CompanyDTO;
+  csrfToken: string;
+  onClose: () => void;
+}) {
+  const { t } = useTranslation("companies");
+
+  return (
+    <FormDialog
+      cancelLabel={t("cancel")}
+      formActions
+      onOpenChange={(open) => {
+        if (!open) {
+          onClose();
+        }
+      }}
+      open
+      title={t(profile ? "profiles.edit" : "profiles.new")}
+      wide
+    >
+      <WorkProfileForm
+        company={company}
+        csrfToken={csrfToken}
+        onSaved={() => onClose()}
+        profile={profile}
+      />
+    </FormDialog>
+  );
+}
diff --git a/modules/companies/src/web/profiles/work-profile-form.tsx b/modules/companies/src/web/profiles/work-profile-form.tsx
index 20387cd..18d1d4d 100644
--- a/modules/companies/src/web/profiles/work-profile-form.tsx
+++ b/modules/companies/src/web/profiles/work-profile-form.tsx
@@ -13,17 +13,12 @@ import { useForm } from "react-hook-form";
 import { useTranslation } from "react-i18next";
 
 import type { CompanyDTO } from "../../common";
-import {
-  type WorkProfileDTO,
-  type WorkProfileInput,
-  WorkProfileInputSchema,
-} from "../../common/work-profiles";
+import type { WorkProfileDTO, WorkProfileInput } from "../../common/work-profiles";
+import { WorkProfileInputSchema } from "../../common/work-profiles";
 import { accessApi, accessKeys } from "../access/access-api";
 import { accessLabel } from "../access/access-labels";
-import {
-  ConfigurationQuickEditor,
-  type ConfigurationQuickKind,
-} from "../components/configuration-quick-editor";
+import type { ConfigurationQuickKind } from "../components/configuration-quick-editor";
+import { ConfigurationQuickEditor } from "../components/configuration-quick-editor";
 
 import { ProfileFeedback } from "./profile-feedback";
 import { profileApi, profileKeys } from "./work-profile-api";
diff --git a/modules/companies/src/web/profiles/work-profile-history-dialog.tsx b/modules/companies/src/web/profiles/work-profile-history-dialog.tsx
new file mode 100644
index 0000000..e21ce0f
--- /dev/null
+++ b/modules/companies/src/web/profiles/work-profile-history-dialog.tsx
@@ -0,0 +1,84 @@
+import type { WorkstationDTO } from "@metis/assets/common";
+import { FormDialog } from "@repo/shadcn-ui/components/form-dialog";
+import { useTranslation } from "react-i18next";
+
+import type { WorkProfileDTO } from "../../common/work-profiles";
+
+export function WorkProfileHistoryDialog({
+  profile,
+  workstations,
+  person,
+  asset,
+  account,
+  onClose,
+}: {
+  profile: WorkProfileDTO;
+  workstations: readonly WorkstationDTO[];
+  person: (id: string) => string;
+  asset: (id: string) => string;
+  account: (id: string | null) => string;
+  onClose: () => void;
+}) {
+  const { t, i18n } = useTranslation("companies");
+
+  return (
+    <FormDialog
+      cancelLabel={t("close")}
+      onOpenChange={(open) => {
+        if (!open) {
+          onClose();
+        }
+      }}
+      open
+      title={t("profiles.history")}
+      wide
+    >
+      <div className="space-y-4">
+        <p className="font-medium">
+          {person(profile.values.personId)} · {asset(profile.values.assetId)}
+        </p>
+        <p>
+          {t("profiles.account")}: {account(profile.values.accountId)}
+        </p>
+        {profile.needsReview && <p className="text-amber-700">{t("profiles.review")}</p>}
+        <p className="text-sm text-muted-foreground">{t("profiles.unknownConfiguration")}</p>
+        <div>
+          <h3 className="font-medium">{t("profiles.stations")}</h3>
+          <p className="text-sm">
+            {workstations
+              .filter(
+                (station) =>
+                  station.values.active &&
+                  [...station.values.assetIds, ...station.values.sharedAssetIds].includes(
+                    profile.values.assetId
+                  )
+              )
+              .map((station) => station.values.name)
+              .join(" · ") || t("profiles.noStation")}
+          </p>
+        </div>
+        <ol className="space-y-3">
+          {[...profile.history].reverse().map((revision) => (
+            <li className="rounded-md border p-3 text-sm" key={revision.id}>
+              <p className="font-medium">
+                {new Intl.DateTimeFormat(i18n.language, {
+                  dateStyle: "medium",
+                  timeStyle: "short",
+                }).format(new Date(revision.recordedAt))}{" "}
+                · {revision.actorName}
+              </p>
+              <p>
+                {revision.values.name} ·{" "}
+                {t(revision.values.active ? "profiles.active" : "profiles.inactive")}
+              </p>
+              <p>{account(revision.values.accountId)}</p>
+              {revision.values.notes && (
+                <p className="mt-2 whitespace-pre-wrap">{revision.values.notes}</p>
+              )}
+            </li>
+          ))}
+        </ol>
+      </div>
+    </FormDialog>
+  );
+}
diff --git a/modules/companies/src/web/profiles/work-profiles-page.tsx b/modules/companies/src/web/profiles/work-profiles-page.tsx
index 558481c..7f0dda3 100644
--- a/modules/companies/src/web/profiles/work-profiles-page.tsx
+++ b/modules/companies/src/web/profiles/work-profiles-page.tsx
@@ -7,7 +7,6 @@ import {
   EntityStatus,
   EntityTable,
 } from "@repo/shadcn-ui/components/entity-list";
-import { FormDialog } from "@repo/shadcn-ui/components/form-dialog";
 import { useQuery } from "@tanstack/react-query";
 import { useState } from "react";
 import { useTranslation } from "react-i18next";
@@ -20,7 +19,8 @@ import { ProfileConfigurations } from "./profile-configurations";
 import { ProfileFeedback } from "./profile-feedback";
 import type { ProfileSelection } from "./profile-selection";
 import { profileApi, profileKeys } from "./work-profile-api";
-import { WorkProfileForm } from "./work-profile-form";
+import { WorkProfileEditorDialog } from "./work-profile-editor-dialog";
+import { WorkProfileHistoryDialog } from "./work-profile-history-dialog";
 
 export function WorkProfilesPage({
   company,
@@ -242,85 +242,22 @@ export function WorkProfilesPage({
         />
       )}
       {editor && (
-        <FormDialog
-          cancelLabel={t("cancel")}
-          formActions
-          onOpenChange={(open) => {
-            if (!open) {
-              setEditor(undefined);
-            }
-          }}
-          open
-          title={t(edited ? "profiles.edit" : "profiles.new")}
-          wide
-        >
-          <WorkProfileForm
-            company={company}
-            csrfToken={csrfToken}
-            onSaved={() => setEditor(undefined)}
-            profile={edited}
-          />
-        </FormDialog>
+        <WorkProfileEditorDialog
+          company={company}
+          csrfToken={csrfToken}
+          onClose={() => setEditor(undefined)}
+          profile={edited}
+        />
       )}
       {viewed && (
-        <FormDialog
-          cancelLabel={t("close")}
-          onOpenChange={(open) => {
-            if (!open) {
-              setView(undefined);
-            }
-          }}
-          open
-          title={t("profiles.history")}
-          wide
-        >
-          <div className="space-y-4">
-            <p className="font-medium">
-              {person(viewed.values.personId)} · {asset(viewed.values.assetId)}
-            </p>
-            <p>
-              {t("profiles.account")}: {account(viewed.values.accountId)}
-            </p>
-            {viewed.needsReview && <p className="text-amber-700">{t("profiles.review")}</p>}
-            <p className="text-sm text-muted-foreground">{t("profiles.unknownConfiguration")}</p>
-            <div>
-              <h3 className="font-medium">{t("profiles.stations")}</h3>
-              <p className="text-sm">
-                {inventory.data?.workstations
-                  .filter(
-                    (station) =>
-                      station.values.active &&
-                      [...station.values.assetIds, ...station.values.sharedAssetIds].includes(
-                        viewed.values.assetId
-                      )
-                  )
-                  .map((station) => station.values.name)
-                  .join(" · ") || t("profiles.noStation")}
-              </p>
-            </div>
-            <ol className="space-y-3">
-              {[...viewed.history].reverse().map((revision) => (
-                <li className="rounded-md border p-3 text-sm" key={revision.id}>
-                  <p className="font-medium">
-                    {new Intl.DateTimeFormat(i18n.language, {
-                      dateStyle: "medium",
-                      timeStyle: "short",
-                    }).format(new Date(revision.recordedAt))}{" "}
-                    · {revision.actorName}
-                  </p>
-                  <p>
-                    {revision.values.name} ·{" "}
-                    {t(revision.values.active ? "profiles.active" : "profiles.inactive")}
-                  </p>
-                  <p>{account(revision.values.accountId)}</p>
-                  {revision.values.notes && (
-                    <p className="mt-2 whitespace-pre-wrap">{revision.values.notes}</p>
-                  )}
-                </li>
-              ))}
-            </ol>
-          </div>
-        </FormDialog>
+        <WorkProfileHistoryDialog
+          account={account}
+          asset={asset}
+          onClose={() => setView(undefined)}
+          person={person}
+          profile={viewed}
+          workstations={inventory.data?.workstations ?? []}
+        />
       )}
     </div>
   );
diff --git a/modules/companies/src/web/remote/remote-api.ts b/modules/companies/src/web/remote/remote-api.ts
index aac2e26..1345947 100644
--- a/modules/companies/src/web/remote/remote-api.ts
+++ b/modules/companies/src/web/remote/remote-api.ts
@@ -1,7 +1,7 @@
 import { z } from "zod/v4";
 
+import type { RemoteConnectionInput } from "../../common/remote-connections";
 import {
-  type RemoteConnectionInput,
   RemoteConnectionResponseSchema,
   RemoteConnectionsResponseSchema,
 } from "../../common/remote-connections";
diff --git a/modules/companies/src/web/remote/remote-connection-editor-dialog.tsx b/modules/companies/src/web/remote/remote-connection-editor-dialog.tsx
new file mode 100644
index 0000000..0e77972
--- /dev/null
+++ b/modules/companies/src/web/remote/remote-connection-editor-dialog.tsx
@@ -0,0 +1,46 @@
+import { FormDialog } from "@repo/shadcn-ui/components/form-dialog";
+import type { ComponentProps } from "react";
+import { useTranslation } from "react-i18next";
+
+import type { CompanyDTO } from "../../common";
+
+import { RemoteConnectionForm } from "./remote-connection-form";
+
+export function RemoteConnectionEditorDialog({
+  connection,
+  company,
+  csrfToken,
+  initialPersonId,
+  onClose,
+}: {
+  connection: ComponentProps<typeof RemoteConnectionForm>["connection"];
+  company: CompanyDTO;
+  csrfToken: string;
+  initialPersonId: ComponentProps<typeof RemoteConnectionForm>["initialPersonId"];
+  onClose: () => void;
+}) {
+  const { t } = useTranslation("companies");
+
+  return (
+    <FormDialog
+      cancelLabel={t("cancel")}
+      formActions
+      onOpenChange={(open) => {
+        if (!open) {
+          onClose();
+        }
+      }}
+      open
+      title={t(connection ? "remote.edit" : "remote.new")}
+      wide
+    >
+      <RemoteConnectionForm
+        company={company}
+        connection={connection}
+        csrfToken={csrfToken}
+        initialPersonId={initialPersonId}
+        onSaved={() => onClose()}
+      />
+    </FormDialog>
+  );
+}
diff --git a/modules/companies/src/web/remote/remote-connection-form.tsx b/modules/companies/src/web/remote/remote-connection-form.tsx
index 70a0c42..db9bb28 100644
--- a/modules/companies/src/web/remote/remote-connection-form.tsx
+++ b/modules/companies/src/web/remote/remote-connection-form.tsx
@@ -18,17 +18,17 @@ import { useForm } from "react-hook-form";
 import { useTranslation } from "react-i18next";
 
 import type { CompanyDTO } from "../../common";
+import type { RemoteConnectionDTO, RemoteConnectionInput } from "../../common/remote-connections";
 import {
   REMOTE_STATE_TRANSITIONS,
-  type RemoteConnectionDTO,
-  type RemoteConnectionInput,
   RemoteConnectionInputSchema,
 } from "../../common/remote-connections";
 
 import { remoteApi, remoteKeys } from "./remote-api";
 import { RemoteEndpointFields } from "./remote-endpoint-fields";
 import { RemoteFeedback } from "./remote-feedback";
-import { RemoteQuickEditor, type RemoteQuickKind } from "./remote-quick-editor";
+import type { RemoteQuickKind } from "./remote-quick-editor";
+import { RemoteQuickEditor } from "./remote-quick-editor";
 
 const quickFields = {
   person: "personId",
diff --git a/modules/companies/src/web/remote/remote-connection-history-dialog.tsx b/modules/companies/src/web/remote/remote-connection-history-dialog.tsx
new file mode 100644
index 0000000..3211312
--- /dev/null
+++ b/modules/companies/src/web/remote/remote-connection-history-dialog.tsx
@@ -0,0 +1,63 @@
+import { FormDialog } from "@repo/shadcn-ui/components/form-dialog";
+import { useTranslation } from "react-i18next";
+
+import type { CompanyDTO } from "../../common";
+import type { RemoteConnectionDTO } from "../../common/remote-connections";
+
+import { remoteEndpoints } from "./remote-summary";
+
+export function RemoteConnectionHistoryDialog({
+  connection,
+  company,
+  inventory,
+  entries,
+  person,
+  onClose,
+}: {
+  connection: RemoteConnectionDTO;
+  company: CompanyDTO;
+  inventory: Parameters<typeof remoteEndpoints>[2];
+  entries: Parameters<typeof remoteEndpoints>[3];
+  person: (id: string) => string;
+  onClose: () => void;
+}) {
+  const { t, i18n } = useTranslation("companies");
+
+  return (
+    <FormDialog
+      cancelLabel={t("close")}
+      onOpenChange={(open) => {
+        if (!open) {
+          onClose();
+        }
+      }}
+      open
+      title={t("remote.history")}
+      wide
+    >
+      <p className="font-medium">{person(connection.values.personId)}</p>
+      <ol className="space-y-3">
+        {[...connection.history].reverse().map((r) => {
+          const route = remoteEndpoints(r.values, company, inventory, entries, t);
+          return (
+            <li className="rounded-md border p-3 text-sm" key={r.id}>
+              <p className="font-medium">
+                {new Intl.DateTimeFormat(i18n.language, {
+                  dateStyle: "medium",
+                  timeStyle: "short",
+                }).format(new Date(r.recordedAt))}{" "}
+                · {r.actorName}
+              </p>
+              <p>
+                {route.source} → {r.values.method} → {route.target}
+              </p>
+              <p>{t(`mail.${r.values.state}`)}</p>
+              {r.values.requiresVpn && <p>{t("remote.vpnRequired")}</p>}
+              {r.values.notes && <p className="mt-2 whitespace-pre-wrap">{r.values.notes}</p>}
+            </li>
+          );
+        })}
+      </ol>
+    </FormDialog>
+  );
+}
diff --git a/modules/companies/src/web/remote/remote-connections-page.tsx b/modules/companies/src/web/remote/remote-connections-page.tsx
index e451be8..5dd9135 100644
--- a/modules/companies/src/web/remote/remote-connections-page.tsx
+++ b/modules/companies/src/web/remote/remote-connections-page.tsx
@@ -11,7 +11,6 @@ import {
   EntityStatus,
   EntityTable,
 } from "@repo/shadcn-ui/components/entity-list";
-import { FormDialog } from "@repo/shadcn-ui/components/form-dialog";
 import { useQuery } from "@tanstack/react-query";
 import { useState } from "react";
 import { useTranslation } from "react-i18next";
@@ -19,7 +18,8 @@ import { useTranslation } from "react-i18next";
 import type { CompanyDTO } from "../../common";
 
 import { remoteApi, remoteKeys } from "./remote-api";
-import { RemoteConnectionForm } from "./remote-connection-form";
+import { RemoteConnectionEditorDialog } from "./remote-connection-editor-dialog";
+import { RemoteConnectionHistoryDialog } from "./remote-connection-history-dialog";
 import { RemoteFeedback } from "./remote-feedback";
 import { RemoteSummary, remoteEndpoints } from "./remote-summary";
 
@@ -186,63 +186,23 @@ export function RemoteConnectionsPage({
         />
       )}
       {editor && (
-        <FormDialog
-          cancelLabel={t("cancel")}
-          formActions
-          onOpenChange={(open) => {
-            if (!open) {
-              setEditor(undefined);
-            }
-          }}
-          open
-          title={t(edited ? "remote.edit" : "remote.new")}
-          wide
-        >
-          <RemoteConnectionForm
-            company={company}
-            connection={edited}
-            csrfToken={csrfToken}
-            initialPersonId={initialPersonId}
-            onSaved={() => setEditor(undefined)}
-          />
-        </FormDialog>
+        <RemoteConnectionEditorDialog
+          company={company}
+          connection={edited}
+          csrfToken={csrfToken}
+          initialPersonId={initialPersonId}
+          onClose={() => setEditor(undefined)}
+        />
       )}
       {viewed && (
-        <FormDialog
-          cancelLabel={t("close")}
-          onOpenChange={(open) => {
-            if (!open) {
-              setView(undefined);
-            }
-          }}
-          open
-          title={t("remote.history")}
-          wide
-        >
-          <p className="font-medium">{person(viewed.values.personId)}</p>
-          <ol className="space-y-3">
-            {[...viewed.history].reverse().map((r) => {
-              const route = remoteEndpoints(r.values, company, inventory, entries, t);
-              return (
-                <li className="rounded-md border p-3 text-sm" key={r.id}>
-                  <p className="font-medium">
-                    {new Intl.DateTimeFormat(i18n.language, {
-                      dateStyle: "medium",
-                      timeStyle: "short",
-                    }).format(new Date(r.recordedAt))}{" "}
-                    · {r.actorName}
-                  </p>
-                  <p>
-                    {route.source} → {r.values.method} → {route.target}
-                  </p>
-                  <p>{t(`mail.${r.values.state}`)}</p>
-                  {r.values.requiresVpn && <p>{t("remote.vpnRequired")}</p>}
-                  {r.values.notes && <p className="mt-2 whitespace-pre-wrap">{r.values.notes}</p>}
-                </li>
-              );
-            })}
-          </ol>
-        </FormDialog>
+        <RemoteConnectionHistoryDialog
+          company={company}
+          connection={viewed}
+          entries={entries}
+          inventory={inventory}
+          onClose={() => setView(undefined)}
+          person={person}
+        />
       )}
     </div>
   );
diff --git a/modules/companies/src/web/remote/remote-endpoint-fields.tsx b/modules/companies/src/web/remote/remote-endpoint-fields.tsx
index 69699ee..4afb1f5 100644
--- a/modules/companies/src/web/remote/remote-endpoint-fields.tsx
+++ b/modules/companies/src/web/remote/remote-endpoint-fields.tsx
@@ -4,10 +4,8 @@ import type { UseFormReturn } from "react-hook-form";
 import { useTranslation } from "react-i18next";
 
 import type { CompanyDTO } from "../../common";
-import {
-  type RemoteConnectionInput,
-  RemoteConnectionInputSchema,
-} from "../../common/remote-connections";
+import type { RemoteConnectionInput } from "../../common/remote-connections";
+import { RemoteConnectionInputSchema } from "../../common/remote-connections";
 
 import type { RemoteQuickKind } from "./remote-quick-editor";
 
diff --git a/modules/companies/src/web/telework/telework-api.ts b/modules/companies/src/web/telework/telework-api.ts
index 9645bb6..d8b97e7 100644
--- a/modules/companies/src/web/telework/telework-api.ts
+++ b/modules/companies/src/web/telework/telework-api.ts
@@ -1,7 +1,7 @@
 import { z } from "zod/v4";
 
+import type { TeleworkAuthorizationInput } from "../../common/telework-authorizations";
 import {
-  type TeleworkAuthorizationInput,
   TeleworkAuthorizationResponseSchema,
   TeleworkAuthorizationsResponseSchema,
 } from "../../common/telework-authorizations";
diff --git a/modules/companies/src/web/telework/telework-authorization-editor-dialog.tsx b/modules/companies/src/web/telework/telework-authorization-editor-dialog.tsx
new file mode 100644
index 0000000..2b911d5
--- /dev/null
+++ b/modules/companies/src/web/telework/telework-authorization-editor-dialog.tsx
@@ -0,0 +1,48 @@
+import { FormDialog } from "@repo/shadcn-ui/components/form-dialog";
+import type { ComponentProps } from "react";
+import { useTranslation } from "react-i18next";
+
+import type { CompanyDTO } from "../../common";
+
+import { TeleworkAuthorizationForm } from "./telework-authorization-form";
+
+export function TeleworkAuthorizationEditorDialog({
+  authorization,
+  company,
+  csrfToken,
+  authorizations,
+  initialPersonId,
+  onClose,
+}: {
+  authorization: ComponentProps<typeof TeleworkAuthorizationForm>["authorization"];
+  company: CompanyDTO;
+  csrfToken: string;
+  authorizations: ComponentProps<typeof TeleworkAuthorizationForm>["authorizations"];
+  initialPersonId: ComponentProps<typeof TeleworkAuthorizationForm>["initialPersonId"];
+  onClose: () => void;
+}) {
+  const { t } = useTranslation("companies");
+
+  return (
+    <FormDialog
+      cancelLabel={t("cancel")}
+      formActions
+      onOpenChange={(open) => {
+        if (!open) {
+          onClose();
+        }
+      }}
+      open
+      title={t(authorization ? "telework.edit" : "telework.new")}
+    >
+      <TeleworkAuthorizationForm
+        authorization={authorization}
+        authorizations={authorizations}
+        company={company}
+        csrfToken={csrfToken}
+        initialPersonId={initialPersonId}
+        onSaved={() => onClose()}
+      />
+    </FormDialog>
+  );
+}
diff --git a/modules/companies/src/web/telework/telework-authorization-form.tsx b/modules/companies/src/web/telework/telework-authorization-form.tsx
index da3ea51..6e4d3b4 100644
--- a/modules/companies/src/web/telework/telework-authorization-form.tsx
+++ b/modules/companies/src/web/telework/telework-authorization-form.tsx
@@ -2,7 +2,7 @@ import { zodResolver } from "@hookform/resolvers/zod";
 import { Button } from "@repo/shadcn-ui/components/button";
 import { Checkbox } from "@repo/shadcn-ui/components/checkbox";
 import { ContextHelp } from "@repo/shadcn-ui/components/context-help";
-import { FormActions, FormDialog } from "@repo/shadcn-ui/components/form-dialog";
+import { FormActions } from "@repo/shadcn-ui/components/form-dialog";
 import { Input } from "@repo/shadcn-ui/components/input";
 import { Label } from "@repo/shadcn-ui/components/label";
 import { SelectWithAction } from "@repo/shadcn-ui/components/select-with-action";
@@ -13,12 +13,12 @@ import { useForm } from "react-hook-form";
 import { useTranslation } from "react-i18next";
 
 import type { CompanyDTO } from "../../common";
-import {
-  type TeleworkAuthorizationDTO,
-  type TeleworkAuthorizationInput,
-  TeleworkAuthorizationInputSchema,
+import type {
+  TeleworkAuthorizationDTO,
+  TeleworkAuthorizationInput,
 } from "../../common/telework-authorizations";
-import { PersonForm } from "../components/person-form";
+import { TeleworkAuthorizationInputSchema } from "../../common/telework-authorizations";
+import { PersonEditorDialog } from "../components/person-editor-dialog";
 import { remoteKeys } from "../remote/remote-api";
 
 import { teleworkApi, teleworkKeys } from "./telework-api";
@@ -160,29 +160,23 @@ export function TeleworkAuthorizationForm({
         </FormActions>
       </form>
       {quick && (
-        <FormDialog
-          cancelLabel={t("cancel")}
-          formActions
+        <PersonEditorDialog
+          companyId={company.id}
+          csrfToken={csrfToken}
           onOpenChange={(open) => {
             if (!open) {
               setQuick(false);
             }
           }}
+          onSaved={(id) => {
+            if (mounted.current) {
+              form.setValue("personId", id);
+              setQuick(false);
+            }
+          }}
           open
-          title={t("newPerson")}
-        >
-          <PersonForm
-            companyId={company.id}
-            csrfToken={csrfToken}
-            onSaved={(id) => {
-              if (mounted.current) {
-                form.setValue("personId", id);
-                setQuick(false);
-              }
-            }}
-            requireActive
-          />
-        </FormDialog>
+          requireActive
+        />
       )}
     </>
   );
diff --git a/modules/companies/src/web/telework/telework-authorization-history-dialog.tsx b/modules/companies/src/web/telework/telework-authorization-history-dialog.tsx
new file mode 100644
index 0000000..c5475b1
--- /dev/null
+++ b/modules/companies/src/web/telework/telework-authorization-history-dialog.tsx
@@ -0,0 +1,54 @@
+import { FormDialog } from "@repo/shadcn-ui/components/form-dialog";
+import { useTranslation } from "react-i18next";
+
+import type { TeleworkAuthorizationDTO } from "../../common/telework-authorizations";
+
+export function TeleworkAuthorizationHistoryDialog({
+  authorization,
+  person,
+  onClose,
+}: {
+  authorization: TeleworkAuthorizationDTO;
+  person: (id: string) => string;
+  onClose: () => void;
+}) {
+  const { t, i18n } = useTranslation("companies");
+
+  return (
+    <FormDialog
+      cancelLabel={t("close")}
+      onOpenChange={(open) => {
+        if (!open) {
+          onClose();
+        }
+      }}
+      open
+      title={t("telework.history")}
+    >
+      <p className="font-medium">{person(authorization.values.personId)}</p>
+      <ol className="space-y-3">
+        {[...authorization.history].reverse().map((revision) => (
+          <li className="rounded-md border p-3 text-sm" key={revision.id}>
+            <p className="font-medium">
+              {new Intl.DateTimeFormat(i18n.language, {
+                dateStyle: "medium",
+                timeStyle: "short",
+              }).format(new Date(revision.recordedAt))}{" "}
+              · {revision.actorName}
+            </p>
+            <p>{t(revision.values.active ? "telework.active" : "telework.revoked")}</p>
+            <p>
+              {t("telework.startsOn")}: {revision.values.startsOn ?? t("telework.noDate")}
+            </p>
+            <p>
+              {t("telework.expiresOn")}: {revision.values.expiresOn ?? t("telework.noDate")}
+            </p>
+            {revision.values.notes && (
+              <p className="mt-2 whitespace-pre-wrap">{revision.values.notes}</p>
+            )}
+          </li>
+        ))}
+      </ol>
+    </FormDialog>
+  );
+}
diff --git a/modules/companies/src/web/telework/telework-authorizations-page.tsx b/modules/companies/src/web/telework/telework-authorizations-page.tsx
index 8fd26a7..db89955 100644
--- a/modules/companies/src/web/telework/telework-authorizations-page.tsx
+++ b/modules/companies/src/web/telework/telework-authorizations-page.tsx
@@ -6,7 +6,6 @@ import {
   EntityStatus,
   EntityTable,
 } from "@repo/shadcn-ui/components/entity-list";
-import { FormDialog } from "@repo/shadcn-ui/components/form-dialog";
 import { useQuery } from "@tanstack/react-query";
 import { useState } from "react";
 import { useTranslation } from "react-i18next";
@@ -14,7 +13,8 @@ import { useTranslation } from "react-i18next";
 import type { CompanyDTO } from "../../common";
 
 import { teleworkApi, teleworkKeys } from "./telework-api";
-import { TeleworkAuthorizationForm } from "./telework-authorization-form";
+import { TeleworkAuthorizationEditorDialog } from "./telework-authorization-editor-dialog";
+import { TeleworkAuthorizationHistoryDialog } from "./telework-authorization-history-dialog";
 import { TeleworkAuthorizationSummary } from "./telework-authorization-summary";
 import { TeleworkFeedback } from "./telework-feedback";
 
@@ -152,63 +152,21 @@ export function TeleworkAuthorizationsPage({
         />
       )}
       {editor && (
-        <FormDialog
-          cancelLabel={t("cancel")}
-          formActions
-          onOpenChange={(open) => {
-            if (!open) {
-              setEditor(undefined);
-            }
-          }}
-          open
-          title={t(edited ? "telework.edit" : "telework.new")}
-        >
-          <TeleworkAuthorizationForm
-            authorization={edited}
-            authorizations={authorizations}
-            company={company}
-            csrfToken={csrfToken}
-            initialPersonId={initialPersonId}
-            onSaved={() => setEditor(undefined)}
-          />
-        </FormDialog>
+        <TeleworkAuthorizationEditorDialog
+          authorization={edited}
+          authorizations={authorizations}
+          company={company}
+          csrfToken={csrfToken}
+          initialPersonId={initialPersonId}
+          onClose={() => setEditor(undefined)}
+        />
       )}
       {viewed && (
-        <FormDialog
-          cancelLabel={t("close")}
-          onOpenChange={(open) => {
-            if (!open) {
-              setView(undefined);
-            }
-          }}
-          open
-          title={t("telework.history")}
-        >
-          <p className="font-medium">{person(viewed.values.personId)}</p>
-          <ol className="space-y-3">
-            {[...viewed.history].reverse().map((revision) => (
-              <li className="rounded-md border p-3 text-sm" key={revision.id}>
-                <p className="font-medium">
-                  {new Intl.DateTimeFormat(i18n.language, {
-                    dateStyle: "medium",
-                    timeStyle: "short",
-                  }).format(new Date(revision.recordedAt))}{" "}
-                  · {revision.actorName}
-                </p>
-                <p>{t(revision.values.active ? "telework.active" : "telework.revoked")}</p>
-                <p>
-                  {t("telework.startsOn")}: {revision.values.startsOn ?? t("telework.noDate")}
-                </p>
-                <p>
-                  {t("telework.expiresOn")}: {revision.values.expiresOn ?? t("telework.noDate")}
-                </p>
-                {revision.values.notes && (
-                  <p className="mt-2 whitespace-pre-wrap">{revision.values.notes}</p>
-                )}
-              </li>
-            ))}
-          </ol>
-        </FormDialog>
+        <TeleworkAuthorizationHistoryDialog
+          authorization={viewed}
+          onClose={() => setView(undefined)}
+          person={person}
+        />
       )}
     </div>
   );
diff --git a/modules/companies/src/web/tickets/ticket-api.ts b/modules/companies/src/web/tickets/ticket-api.ts
index b876dcf..1a561db 100644
--- a/modules/companies/src/web/tickets/ticket-api.ts
+++ b/modules/companies/src/web/tickets/ticket-api.ts
@@ -1,11 +1,7 @@
 import { z } from "zod/v4";
 
-import {
-  type SaveTicketInput,
-  TicketListSchema,
-  TicketLookupsSchema,
-  TicketResponseSchema,
-} from "../../common/tickets";
+import type { SaveTicketInput } from "../../common/tickets";
+import { TicketListSchema, TicketLookupsSchema, TicketResponseSchema } from "../../common/tickets";
 export const ticketKeys = {
   list: (companyId?: string) => ["tickets", companyId ?? "global"],
   lookups: (companyId: string) => ["ticket-lookups", companyId],
diff --git a/modules/companies/src/web/tickets/ticket-classification-fields.tsx b/modules/companies/src/web/tickets/ticket-classification-fields.tsx
index bb687ac..61fcf45 100644
--- a/modules/companies/src/web/tickets/ticket-classification-fields.tsx
+++ b/modules/companies/src/web/tickets/ticket-classification-fields.tsx
@@ -3,12 +3,8 @@ import { SelectWithAction } from "@repo/shadcn-ui/components/select-with-action"
 import type { UseFormReturn } from "react-hook-form";
 import { useTranslation } from "react-i18next";
 
-import {
-  TicketChannelSchema,
-  type TicketInput,
-  TicketPrioritySchema,
-  TicketStateSchema,
-} from "../../common/tickets";
+import type { TicketInput } from "../../common/tickets";
+import { TicketChannelSchema, TicketPrioritySchema, TicketStateSchema } from "../../common/tickets";
 export function TicketClassificationFields({
   form,
   prefix,
diff --git a/modules/companies/src/web/tickets/ticket-detail-dialog.tsx b/modules/companies/src/web/tickets/ticket-detail-dialog.tsx
new file mode 100644
index 0000000..9b00cf6
--- /dev/null
+++ b/modules/companies/src/web/tickets/ticket-detail-dialog.tsx
@@ -0,0 +1,33 @@
+import { FormDialog } from "@repo/shadcn-ui/components/form-dialog";
+import type { ComponentProps } from "react";
+import { useTranslation } from "react-i18next";
+
+import { TicketDetail } from "./ticket-detail";
+
+export function TicketDetailDialog({
+  currentView,
+  data,
+  onClose,
+}: {
+  currentView: ComponentProps<typeof TicketDetail>["ticket"] | undefined;
+  data: ComponentProps<typeof TicketDetail>["data"] | undefined;
+  onClose: () => void;
+}) {
+  const { t } = useTranslation("companies");
+
+  return (
+    <FormDialog
+      cancelLabel={t("cancel")}
+      onOpenChange={(value) => {
+        if (!value) {
+          onClose();
+        }
+      }}
+      open={Boolean(currentView)}
+      title={t("tickets.details")}
+      wide
+    >
+      {currentView && data && <TicketDetail data={data} ticket={currentView} />}
+    </FormDialog>
+  );
+}
diff --git a/modules/companies/src/web/tickets/ticket-editor-dialog.tsx b/modules/companies/src/web/tickets/ticket-editor-dialog.tsx
new file mode 100644
index 0000000..6ec2acb
--- /dev/null
+++ b/modules/companies/src/web/tickets/ticket-editor-dialog.tsx
@@ -0,0 +1,45 @@
+import { FormDialog } from "@repo/shadcn-ui/components/form-dialog";
+import type { ComponentProps } from "react";
+import { useTranslation } from "react-i18next";
+
+import { TicketForm } from "./ticket-form";
+
+export function TicketEditorDialog({
+  open,
+  edit,
+  companyId,
+  csrfToken,
+  data,
+  onOpenChange,
+}: {
+  open: boolean;
+  edit: ComponentProps<typeof TicketForm>["ticket"];
+  companyId: string | undefined;
+  csrfToken: string;
+  data: ComponentProps<typeof TicketForm>["data"] | undefined;
+  onOpenChange: (open: boolean) => void;
+}) {
+  const { t } = useTranslation("companies");
+
+  return (
+    <FormDialog
+      cancelLabel={t("cancel")}
+      formActions
+      onOpenChange={onOpenChange}
+      open={open}
+      title={t(edit ? "tickets.edit" : "tickets.new")}
+      wide
+    >
+      {data && (
+        <TicketForm
+          key={edit?.id ?? "new"}
+          {...(companyId ? { scope: companyId } : {})}
+          {...(edit ? { ticket: edit } : {})}
+          csrfToken={csrfToken}
+          data={data}
+          onSaved={() => onOpenChange(false)}
+        />
+      )}
+    </FormDialog>
+  );
+}
diff --git a/modules/companies/src/web/tickets/ticket-form.tsx b/modules/companies/src/web/tickets/ticket-form.tsx
index 8ef0a3d..d621a7b 100644
--- a/modules/companies/src/web/tickets/ticket-form.tsx
+++ b/modules/companies/src/web/tickets/ticket-form.tsx
@@ -11,13 +11,13 @@ import { useId, useState } from "react";
 import { useForm } from "react-hook-form";
 import { useTranslation } from "react-i18next";
 
-import {
-  type TicketDTO,
-  type TicketInput,
-  TicketInputSchema,
-  type TicketListDTO,
-  type TicketTargetInput,
+import type {
+  TicketDTO,
+  TicketInput,
+  TicketListDTO,
+  TicketTargetInput,
 } from "../../common/tickets";
+import { TicketInputSchema } from "../../common/tickets";
 
 import { ticketApi, ticketKeys } from "./ticket-api";
 import { TicketClassificationFields } from "./ticket-classification-fields";
diff --git a/modules/companies/src/web/tickets/ticket-intervention-dialog.tsx b/modules/companies/src/web/tickets/ticket-intervention-dialog.tsx
new file mode 100644
index 0000000..fe54f5e
--- /dev/null
+++ b/modules/companies/src/web/tickets/ticket-intervention-dialog.tsx
@@ -0,0 +1,40 @@
+import { FormDialog } from "@repo/shadcn-ui/components/form-dialog";
+import type { ComponentProps } from "react";
+import { useTranslation } from "react-i18next";
+
+import { TicketInterventionForm } from "../interventions/ticket-intervention-form";
+
+export function TicketInterventionDialog({
+  interventionTicket,
+  csrfToken,
+  onClose,
+}: {
+  interventionTicket: ComponentProps<typeof TicketInterventionForm>["ticket"] | undefined;
+  csrfToken: string;
+  onClose: () => void;
+}) {
+  const { t } = useTranslation("companies");
+
+  return (
+    <FormDialog
+      cancelLabel={t("cancel")}
+      formActions
+      onOpenChange={(value) => {
+        if (!value) {
+          onClose();
+        }
+      }}
+      open={Boolean(interventionTicket)}
+      title={t("interventions.new")}
+      wide
+    >
+      {interventionTicket && (
+        <TicketInterventionForm
+          csrfToken={csrfToken}
+          onSaved={() => onClose()}
+          ticket={interventionTicket}
+        />
+      )}
+    </FormDialog>
+  );
+}
diff --git a/modules/companies/src/web/tickets/ticket-target-create-dialog.tsx b/modules/companies/src/web/tickets/ticket-target-create-dialog.tsx
new file mode 100644
index 0000000..c788fb1
--- /dev/null
+++ b/modules/companies/src/web/tickets/ticket-target-create-dialog.tsx
@@ -0,0 +1,41 @@
+import { FormDialog } from "@repo/shadcn-ui/components/form-dialog";
+import type { ComponentProps } from "react";
+import { useTranslation } from "react-i18next";
+
+import { TicketQuickEditor } from "./ticket-quick-editor";
+
+export function TicketTargetCreateDialog({
+  quick,
+  companyId,
+  csrfToken,
+  onSaved,
+  onOpenChange,
+}: {
+  quick: ComponentProps<typeof TicketQuickEditor>["kind"] | undefined;
+  companyId: string;
+  csrfToken: string;
+  onSaved: (id: string) => void;
+  onOpenChange: (open: boolean) => void;
+}) {
+  const { t } = useTranslation("companies");
+
+  return (
+    <FormDialog
+      cancelLabel={t("cancel")}
+      formActions
+      onOpenChange={onOpenChange}
+      open={Boolean(quick)}
+      title={t("tickets.newTarget")}
+      wide
+    >
+      {quick && (
+        <TicketQuickEditor
+          companyId={companyId}
+          csrfToken={csrfToken}
+          kind={quick}
+          onSaved={onSaved}
+        />
+      )}
+    </FormDialog>
+  );
+}
diff --git a/modules/companies/src/web/tickets/ticket-targets.tsx b/modules/companies/src/web/tickets/ticket-targets.tsx
index 34704b1..ca5b8d4 100644
--- a/modules/companies/src/web/tickets/ticket-targets.tsx
+++ b/modules/companies/src/web/tickets/ticket-targets.tsx
@@ -1,5 +1,4 @@
 import { Button } from "@repo/shadcn-ui/components/button";
-import { FormDialog } from "@repo/shadcn-ui/components/form-dialog";
 import { Label } from "@repo/shadcn-ui/components/label";
 import { SelectWithAction } from "@repo/shadcn-ui/components/select-with-action";
 import { useQueryClient } from "@tanstack/react-query";
@@ -9,7 +8,7 @@ import { useTranslation } from "react-i18next";
 import type { TicketLookupsDTO, TicketTargetInput } from "../../common/tickets";
 
 import { ticketKeys } from "./ticket-api";
-import { TicketQuickEditor } from "./ticket-quick-editor";
+import { TicketTargetCreateDialog } from "./ticket-target-create-dialog";
 export function ticketTargetOptions(lookups: TicketLookupsDTO, kind: TicketTargetInput["kind"]) {
   switch (kind) {
     case "person":
@@ -124,35 +123,25 @@ export function TicketTargets({
           </li>
         ))}
       </ul>
-      <FormDialog
-        cancelLabel={t("cancel")}
-        formActions
+      <TicketTargetCreateDialog
+        companyId={companyId}
+        csrfToken={csrfToken}
         onOpenChange={(open) => {
           if (!open) {
             setQuick(undefined);
           }
         }}
-        open={Boolean(quick)}
-        title={t("tickets.newTarget")}
-        wide
-      >
-        {quick && (
-          <TicketQuickEditor
-            companyId={companyId}
-            csrfToken={csrfToken}
-            kind={quick}
-            onSaved={(id) => {
-              client
-                .invalidateQueries({ queryKey: lookupKey ?? ticketKeys.lookups(companyId) })
-                .then(() => {
-                  add(id, quick);
-                  setQuick(undefined);
-                })
-                .catch(() => undefined);
-            }}
-          />
-        )}
-      </FormDialog>
+        onSaved={(id) => {
+          client
+            .invalidateQueries({ queryKey: lookupKey ?? ticketKeys.lookups(companyId) })
+            .then(() => {
+              add(id, quick);
+              setQuick(undefined);
+            })
+            .catch(() => undefined);
+        }}
+        quick={quick}
+      />
     </section>
   );
 }
diff --git a/modules/companies/src/web/tickets/tickets-page.tsx b/modules/companies/src/web/tickets/tickets-page.tsx
index 0a6c1c3..1a54f70 100644
--- a/modules/companies/src/web/tickets/tickets-page.tsx
+++ b/modules/companies/src/web/tickets/tickets-page.tsx
@@ -6,19 +6,19 @@ import {
   EntityStatus,
   EntityTable,
 } from "@repo/shadcn-ui/components/entity-list";
-import { FormDialog } from "@repo/shadcn-ui/components/form-dialog";
 import { SelectWithAction } from "@repo/shadcn-ui/components/select-with-action";
 import { useQuery } from "@tanstack/react-query";
 import { useState } from "react";
 import { useTranslation } from "react-i18next";
 
-import { type TicketDTO, TicketPrioritySchema, TicketStateSchema } from "../../common/tickets";
-import { TicketInterventionForm } from "../interventions/ticket-intervention-form";
+import type { TicketDTO } from "../../common/tickets";
+import { TicketPrioritySchema, TicketStateSchema } from "../../common/tickets";
 
 import { ticketApi, ticketKeys } from "./ticket-api";
-import { TicketDetail } from "./ticket-detail";
+import { TicketDetailDialog } from "./ticket-detail-dialog";
+import { TicketEditorDialog } from "./ticket-editor-dialog";
 import { TicketFeedback } from "./ticket-feedback";
-import { TicketForm } from "./ticket-form";
+import { TicketInterventionDialog } from "./ticket-intervention-dialog";
 export type TicketFilters = {
   search: string;
   company: string;
@@ -298,58 +298,24 @@ export function TicketsPage({
         title={t(companyId ? "tickets.title" : "tickets.global")}
         unavailable={query.isError}
       />
-      <FormDialog
-        cancelLabel={t("cancel")}
-        formActions
+      <TicketEditorDialog
+        companyId={companyId}
+        csrfToken={csrfToken}
+        data={query.data}
+        edit={edit}
         onOpenChange={setOpen}
         open={open}
-        title={t(edit ? "tickets.edit" : "tickets.new")}
-        wide
-      >
-        {query.data && (
-          <TicketForm
-            key={edit?.id ?? "new"}
-            {...(companyId ? { scope: companyId } : {})}
-            {...(edit ? { ticket: edit } : {})}
-            csrfToken={csrfToken}
-            data={query.data}
-            onSaved={() => setOpen(false)}
-          />
-        )}
-      </FormDialog>
-      <FormDialog
-        cancelLabel={t("cancel")}
-        formActions
-        onOpenChange={(value) => {
-          if (!value) {
-            setInterventionTicketId(undefined);
-          }
-        }}
-        open={Boolean(interventionTicket)}
-        title={t("interventions.new")}
-        wide
-      >
-        {interventionTicket && (
-          <TicketInterventionForm
-            csrfToken={csrfToken}
-            onSaved={() => setInterventionTicketId(undefined)}
-            ticket={interventionTicket}
-          />
-        )}
-      </FormDialog>
-      <FormDialog
-        cancelLabel={t("cancel")}
-        onOpenChange={(value) => {
-          if (!value) {
-            setViewId(undefined);
-          }
-        }}
-        open={Boolean(currentView)}
-        title={t("tickets.details")}
-        wide
-      >
-        {currentView && query.data && <TicketDetail data={query.data} ticket={currentView} />}
-      </FormDialog>
+      />
+      <TicketInterventionDialog
+        csrfToken={csrfToken}
+        interventionTicket={interventionTicket}
+        onClose={() => setInterventionTicketId(undefined)}
+      />
+      <TicketDetailDialog
+        currentView={currentView}
+        data={query.data}
+        onClose={() => setViewId(undefined)}
+      />
     </div>
   );
 }
diff --git a/modules/identity/src/web/components/account-password-dialog.tsx b/modules/identity/src/web/components/account-password-dialog.tsx
new file mode 100644
index 0000000..939f676
--- /dev/null
+++ b/modules/identity/src/web/components/account-password-dialog.tsx
@@ -0,0 +1,31 @@
+import { FormDialog } from "@repo/shadcn-ui/components/form-dialog";
+import { useTranslation } from "react-i18next";
+
+import { PasswordForm } from "./password-form";
+
+export function AccountPasswordDialog({
+  open,
+  csrfToken,
+  onClose,
+}: {
+  open: boolean;
+  csrfToken: string;
+  onClose: () => void;
+}) {
+  const { t } = useTranslation("identity");
+  return (
+    <FormDialog
+      cancelLabel={t("cancel")}
+      formActions
+      onOpenChange={(value) => {
+        if (!value) {
+          onClose();
+        }
+      }}
+      open={open}
+      title={t("changePassword")}
+    >
+      <PasswordForm csrfToken={csrfToken} showTitle={false} />
+    </FormDialog>
+  );
+}
diff --git a/modules/identity/src/web/components/custom-workspace.tsx b/modules/identity/src/web/components/custom-workspace.tsx
index d534fcf..1f805a7 100644
--- a/modules/identity/src/web/components/custom-workspace.tsx
+++ b/modules/identity/src/web/components/custom-workspace.tsx
@@ -1,12 +1,11 @@
 import { Button } from "@repo/shadcn-ui/components/button";
-import { FormDialog } from "@repo/shadcn-ui/components/form-dialog";
 import { useTranslation } from "react-i18next";
 
 import type { SessionResponseDTO } from "../../common";
 
+import { AccountPasswordDialog } from "./account-password-dialog";
 import { FormFeedback } from "./form-feedback";
-import { PasswordForm } from "./password-form";
-import { UserManagement } from "./user-management";
+import { UserManagementDialog } from "./user-management-dialog";
 import type { WorkspaceRenderer } from "./workspace-page";
 
 export function CustomWorkspace({
@@ -52,31 +51,20 @@ export function CustomWorkspace({
           <FormFeedback error={logoutError} />
         </div>
       )}
-      <FormDialog
-        cancelLabel={t("cancel")}
+      <UserManagementDialog
+        csrfToken={snapshot.csrfToken}
         onOpenChange={(open) => {
           if (!open) {
             setPage("home");
           }
         }}
         open={page === "users" && snapshot.user.isInitialAdmin}
-        title={t("users")}
-        wide
-      >
-        <UserManagement csrfToken={snapshot.csrfToken} />
-      </FormDialog>
-      <FormDialog
-        cancelLabel={t("cancel")}
-        onOpenChange={(open) => {
-          if (!open) {
-            setPage("home");
-          }
-        }}
+      />
+      <AccountPasswordDialog
+        csrfToken={snapshot.csrfToken}
+        onClose={() => setPage("home")}
         open={page === "password"}
-        title={t("changePassword")}
-      >
-        <PasswordForm csrfToken={snapshot.csrfToken} />
-      </FormDialog>
+      />
     </>
   );
 }
diff --git a/modules/identity/src/web/components/password-form.tsx b/modules/identity/src/web/components/password-form.tsx
index 6e0ec8f..9b46583 100644
--- a/modules/identity/src/web/components/password-form.tsx
+++ b/modules/identity/src/web/components/password-form.tsx
@@ -1,5 +1,6 @@
 import { zodResolver } from "@hookform/resolvers/zod";
 import { Button } from "@repo/shadcn-ui/components/button";
+import { FormActions } from "@repo/shadcn-ui/components/form-dialog";
 import { Input } from "@repo/shadcn-ui/components/input";
 import { Label } from "@repo/shadcn-ui/components/label";
 import { useMutation, useQueryClient } from "@tanstack/react-query";
@@ -93,9 +94,11 @@ export function PasswordForm({
         </p>
       )}
       <FormFeedback error={mutation.error} success={mutation.isSuccess} />
-      <Button disabled={mutation.isPending} type="submit">
-        {t(mutation.isPending ? "saving" : "save")}
-      </Button>
+      <FormActions>
+        <Button disabled={mutation.isPending} type="submit">
+          {t(mutation.isPending ? "saving" : "save")}
+        </Button>
+      </FormActions>
     </form>
   );
 }
diff --git a/modules/identity/src/web/components/user-editor-dialog.tsx b/modules/identity/src/web/components/user-editor-dialog.tsx
new file mode 100644
index 0000000..69ab5e0
--- /dev/null
+++ b/modules/identity/src/web/components/user-editor-dialog.tsx
@@ -0,0 +1,54 @@
+import { FormDialog } from "@repo/shadcn-ui/components/form-dialog";
+import { useTranslation } from "react-i18next";
+
+import type { UserDTO } from "../../common";
+
+import { PasswordForm } from "./password-form";
+import { UserForm } from "./user-form";
+
+export function UserEditorDialog(
+  props: {
+    open: boolean;
+    csrfToken: string;
+    onClose: () => void;
+  } & ({ mode: "create" } | { mode: "edit" | "password"; user: UserDTO })
+) {
+  const { t } = useTranslation("identity");
+  return (
+    <FormDialog
+      cancelLabel={t("cancel")}
+      formActions
+      onOpenChange={(open) => {
+        if (!open) {
+          props.onClose();
+        }
+      }}
+      open={props.open}
+      title={t(
+        props.mode === "create"
+          ? "createUser"
+          : props.mode === "edit"
+            ? "editUser"
+            : "resetPassword"
+      )}
+    >
+      {props.mode === "password" ? (
+        <PasswordForm
+          csrfToken={props.csrfToken}
+          key={props.user.id}
+          onSaved={props.onClose}
+          showTitle={false}
+          target={props.user}
+        />
+      ) : (
+        <UserForm
+          csrfToken={props.csrfToken}
+          key={props.mode === "create" ? "new" : props.user.id}
+          onSaved={props.onClose}
+          showTitle={false}
+          {...(props.mode === "edit" ? { user: props.user } : {})}
+        />
+      )}
+    </FormDialog>
+  );
+}
diff --git a/modules/identity/src/web/components/user-form.tsx b/modules/identity/src/web/components/user-form.tsx
index b439ba7..9e73d27 100644
--- a/modules/identity/src/web/components/user-form.tsx
+++ b/modules/identity/src/web/components/user-form.tsx
@@ -1,6 +1,7 @@
 import { zodResolver } from "@hookform/resolvers/zod";
 import { Button } from "@repo/shadcn-ui/components/button";
 import { Checkbox } from "@repo/shadcn-ui/components/checkbox";
+import { FormActions } from "@repo/shadcn-ui/components/form-dialog";
 import { Input } from "@repo/shadcn-ui/components/input";
 import { Label } from "@repo/shadcn-ui/components/label";
 import { useMutation, useQueryClient } from "@tanstack/react-query";
@@ -132,9 +133,11 @@ export function UserForm({
         </p>
       )}
       <FormFeedback error={mutation.error} success={mutation.isSuccess} />
-      <Button disabled={mutation.isPending} type="submit">
-        {t(mutation.isPending ? "saving" : "save")}
-      </Button>
+      <FormActions>
+        <Button disabled={mutation.isPending} type="submit">
+          {t(mutation.isPending ? "saving" : "save")}
+        </Button>
+      </FormActions>
     </form>
   );
 }
diff --git a/modules/identity/src/web/components/user-management-dialog.tsx b/modules/identity/src/web/components/user-management-dialog.tsx
new file mode 100644
index 0000000..ff6f6e9
--- /dev/null
+++ b/modules/identity/src/web/components/user-management-dialog.tsx
@@ -0,0 +1,28 @@
+import { FormDialog } from "@repo/shadcn-ui/components/form-dialog";
+import { useTranslation } from "react-i18next";
+
+import { UserManagement } from "./user-management";
+
+export function UserManagementDialog({
+  open,
+  csrfToken,
+  onOpenChange,
+}: {
+  open: boolean;
+  csrfToken: string;
+  onOpenChange: (open: boolean) => void;
+}) {
+  const { t } = useTranslation("identity");
+
+  return (
+    <FormDialog
+      cancelLabel={t("cancel")}
+      onOpenChange={onOpenChange}
+      open={open}
+      title={t("users")}
+      wide
+    >
+      <UserManagement csrfToken={csrfToken} />
+    </FormDialog>
+  );
+}
diff --git a/modules/identity/src/web/components/user-management.tsx b/modules/identity/src/web/components/user-management.tsx
index 2b6b720..477d665 100644
--- a/modules/identity/src/web/components/user-management.tsx
+++ b/modules/identity/src/web/components/user-management.tsx
@@ -6,7 +6,6 @@ import {
   EntityStatus,
   EntityTable,
 } from "@repo/shadcn-ui/components/entity-list";
-import { FormDialog } from "@repo/shadcn-ui/components/form-dialog";
 import { useQuery } from "@tanstack/react-query";
 import { useState } from "react";
 import { useTranslation } from "react-i18next";
@@ -15,8 +14,7 @@ import type { UserDTO } from "../../common";
 import { identityApi, identityKeys } from "../api/identity-api";
 
 import { FormFeedback } from "./form-feedback";
-import { PasswordForm } from "./password-form";
-import { UserForm } from "./user-form";
+import { UserEditorDialog } from "./user-editor-dialog";
 
 export function UserManagement({ csrfToken }: { csrfToken: string }) {
   const { t, i18n } = useTranslation("identity");
@@ -112,43 +110,21 @@ export function UserManagement({ csrfToken }: { csrfToken: string }) {
           title={t("users")}
         />
       )}
-      <FormDialog
-        cancelLabel={t("cancel")}
-        onOpenChange={setCreateOpen}
+      <UserEditorDialog
+        csrfToken={csrfToken}
+        mode="create"
+        onClose={() => setCreateOpen(false)}
         open={createOpen}
-        title={t("createUser")}
-      >
-        <UserForm csrfToken={csrfToken} onSaved={() => setCreateOpen(false)} showTitle={false} />
-      </FormDialog>
-      <FormDialog
-        cancelLabel={t("cancel")}
-        onOpenChange={(open) => {
-          if (!open) {
-            setSelection(undefined);
-          }
-        }}
-        open={selected !== undefined}
-        title={t(selection?.action === "password" ? "resetPassword" : "editUser")}
-      >
-        {selected &&
-          (selection?.action === "edit" ? (
-            <UserForm
-              csrfToken={csrfToken}
-              key={selected.id}
-              onSaved={() => setSelection(undefined)}
-              showTitle={false}
-              user={selected}
-            />
-          ) : (
-            <PasswordForm
-              csrfToken={csrfToken}
-              key={selected.id}
-              onSaved={() => setSelection(undefined)}
-              showTitle={false}
-              target={selected}
-            />
-          ))}
-      </FormDialog>
+      />
+      {selected && selection && (
+        <UserEditorDialog
+          csrfToken={csrfToken}
+          mode={selection.action}
+          onClose={() => setSelection(undefined)}
+          open
+          user={selected}
+        />
+      )}
     </div>
   );
 }
diff --git a/modules/resources/src/api/domain/resource-catalog.aggregate.ts b/modules/resources/src/api/domain/resource-catalog.aggregate.ts
index 3a18ecd..f5f49a4 100644
--- a/modules/resources/src/api/domain/resource-catalog.aggregate.ts
+++ b/modules/resources/src/api/domain/resource-catalog.aggregate.ts
@@ -1,4 +1,5 @@
-import { AggregateRoot, type UniqueID } from "@repo/rdx-ddd";
+import type { UniqueID } from "@repo/rdx-ddd";
+import { AggregateRoot } from "@repo/rdx-ddd";
 import { Maybe, Result } from "@repo/rdx-utils";
 
 import { ResourceCatalogError } from "./resource-definition";
diff --git a/modules/resources/src/api/domain/resource-definition.entity.ts b/modules/resources/src/api/domain/resource-definition.entity.ts
index 4cbeebc..45429ae 100644
--- a/modules/resources/src/api/domain/resource-definition.entity.ts
+++ b/modules/resources/src/api/domain/resource-definition.entity.ts
@@ -1,4 +1,5 @@
-import { DomainEntity, type UniqueID } from "@repo/rdx-ddd";
+import type { UniqueID } from "@repo/rdx-ddd";
+import { DomainEntity } from "@repo/rdx-ddd";
 import { Maybe, Result } from "@repo/rdx-utils";
 
 import { ResourceCatalogError } from "./resource-definition";
diff --git a/modules/resources/src/api/domain/resource-revision.entity.ts b/modules/resources/src/api/domain/resource-revision.entity.ts
index 1d5c458..1ef2ca7 100644
--- a/modules/resources/src/api/domain/resource-revision.entity.ts
+++ b/modules/resources/src/api/domain/resource-revision.entity.ts
@@ -1,4 +1,5 @@
-import { DomainEntity, type UniqueID } from "@repo/rdx-ddd";
+import type { UniqueID } from "@repo/rdx-ddd";
+import { DomainEntity } from "@repo/rdx-ddd";
 
 import type { ResourceValues } from "./value-objects/resource-values";
 export type ResourceRevisionProps = Readonly<{
diff --git a/modules/resources/src/api/domain/resource.aggregate.ts b/modules/resources/src/api/domain/resource.aggregate.ts
index 6d4aabf..e47369e 100644
--- a/modules/resources/src/api/domain/resource.aggregate.ts
+++ b/modules/resources/src/api/domain/resource.aggregate.ts
@@ -1,4 +1,5 @@
-import { AggregateRoot, type UniqueID } from "@repo/rdx-ddd";
+import type { UniqueID } from "@repo/rdx-ddd";
+import { AggregateRoot } from "@repo/rdx-ddd";
 import { Result } from "@repo/rdx-utils";
 
 import { ResourceCatalogError } from "./resource-definition";
diff --git a/modules/resources/src/api/infrastructure/persistence/resource-dashboard-reader.ts b/modules/resources/src/api/infrastructure/persistence/resource-dashboard-reader.ts
index eb28c0e..617053a 100644
--- a/modules/resources/src/api/infrastructure/persistence/resource-dashboard-reader.ts
+++ b/modules/resources/src/api/infrastructure/persistence/resource-dashboard-reader.ts
@@ -1,4 +1,5 @@
-import { QueryTypes, type Sequelize } from "sequelize";
+import type { Sequelize } from "sequelize";
+import { QueryTypes } from "sequelize";
 
 type Entry = {
   eventId?: string;
diff --git a/modules/resources/src/web/catalog-editor-dialog.tsx b/modules/resources/src/web/catalog-editor-dialog.tsx
new file mode 100644
index 0000000..e460ec4
--- /dev/null
+++ b/modules/resources/src/web/catalog-editor-dialog.tsx
@@ -0,0 +1,68 @@
+import { FormDialog } from "@repo/shadcn-ui/components/form-dialog";
+import { useTranslation } from "react-i18next";
+
+import type { CatalogItemDTO } from "../common";
+
+import { CatalogFieldForm } from "./catalog-form";
+import { CatalogTemplateForm } from "./catalog-template-form";
+
+export type CatalogEditor = {
+  kind: "field" | "template";
+  item?: CatalogItemDTO;
+  copy?: CatalogItemDTO;
+};
+function editorTitle(editor: CatalogEditor) {
+  if (editor.kind === "field") {
+    return editor.item ? "editField" : "newField";
+  }
+  return editor.item ? "editTemplate" : "newTemplate";
+}
+
+export function CatalogEditorDialog({
+  editor,
+  items,
+  scope,
+  csrfToken,
+  onClose,
+}: {
+  editor: CatalogEditor;
+  items: readonly CatalogItemDTO[];
+  scope: string;
+  csrfToken: string;
+  onClose: () => void;
+}) {
+  const { t } = useTranslation("resources");
+
+  return (
+    <FormDialog
+      cancelLabel={t("cancel")}
+      formActions
+      onOpenChange={(open) => {
+        if (!open) {
+          onClose();
+        }
+      }}
+      open
+      title={t(editorTitle(editor))}
+      wide={editor.kind === "template"}
+    >
+      {editor.kind === "field" ? (
+        <CatalogFieldForm
+          csrfToken={csrfToken}
+          item={editor.item}
+          onSaved={() => onClose()}
+          scope={scope}
+        />
+      ) : (
+        <CatalogTemplateForm
+          copy={editor.copy}
+          csrfToken={csrfToken}
+          item={editor.item}
+          items={items}
+          onSaved={() => onClose()}
+          scope={scope}
+        />
+      )}
+    </FormDialog>
+  );
+}
diff --git a/modules/resources/src/web/catalog-field-create-dialog.tsx b/modules/resources/src/web/catalog-field-create-dialog.tsx
new file mode 100644
index 0000000..f899e56
--- /dev/null
+++ b/modules/resources/src/web/catalog-field-create-dialog.tsx
@@ -0,0 +1,31 @@
+import { FormDialog } from "@repo/shadcn-ui/components/form-dialog";
+import { useTranslation } from "react-i18next";
+
+import { CatalogFieldForm } from "./catalog-form";
+
+export function CatalogFieldCreateDialog({
+  scope,
+  csrfToken,
+  onSaved,
+  onOpenChange,
+}: {
+  scope: string;
+  csrfToken: string;
+  onSaved: (id: string) => void;
+  onOpenChange: (open: boolean) => void;
+}) {
+  const { t } = useTranslation("resources");
+
+  return (
+    <FormDialog
+      cancelLabel={t("cancel")}
+      formActions
+      onOpenChange={onOpenChange}
+      open
+      title={t("newField")}
+    >
+      <p className="text-sm text-muted-foreground">{t("quickNotice")}</p>
+      <CatalogFieldForm csrfToken={csrfToken} onSaved={onSaved} scope={scope} />
+    </FormDialog>
+  );
+}
diff --git a/modules/resources/src/web/catalog-page.tsx b/modules/resources/src/web/catalog-page.tsx
index b4625db..a8adc29 100644
--- a/modules/resources/src/web/catalog-page.tsx
+++ b/modules/resources/src/web/catalog-page.tsx
@@ -1,6 +1,5 @@
 import { Button } from "@repo/shadcn-ui/components/button";
 import { EntityListHeader, EntityTable } from "@repo/shadcn-ui/components/entity-list";
-import { FormDialog } from "@repo/shadcn-ui/components/form-dialog";
 import { useMutation, useQuery, useQueryClient } from "@tanstack/react-query";
 import { useState } from "react";
 import { useTranslation } from "react-i18next";
@@ -10,15 +9,9 @@ import type { CatalogItemDTO } from "../common";
 import { catalogApi, catalogKeys } from "./catalog-api";
 import { CatalogCell } from "./catalog-cell";
 import { CatalogDefinitionDialog } from "./catalog-definition-dialog";
+import type { CatalogEditor } from "./catalog-editor-dialog";
+import { CatalogEditorDialog } from "./catalog-editor-dialog";
 import { CatalogError } from "./catalog-error";
-import { CatalogFieldForm } from "./catalog-form";
-import { CatalogTemplateForm } from "./catalog-template-form";
-
-type Editor = {
-  kind: "field" | "template";
-  item?: CatalogItemDTO;
-  copy?: CatalogItemDTO;
-};
 
 export function ResourceCatalogPage({ scope, csrfToken }: { scope: string; csrfToken: string }) {
   const { t, i18n } = useTranslation("resources");
@@ -26,7 +19,7 @@ export function ResourceCatalogPage({ scope, csrfToken }: { scope: string; csrfT
   const [tab, setTab] = useState<"field" | "template">("template");
   const [search, setSearch] = useState("");
   const [viewId, setViewId] = useState<string>();
-  const [editor, setEditor] = useState<Editor>();
+  const [editor, setEditor] = useState<CatalogEditor>();
   const query = useQuery({
     queryKey: catalogKeys.scope(scope),
     queryFn: () => catalogApi.get(scope),
@@ -195,44 +188,14 @@ export function ResourceCatalogPage({ scope, csrfToken }: { scope: string; csrfT
       />
       <CatalogDefinitionDialog item={view} items={items} onClose={() => setViewId(undefined)} />
       {editor && (
-        <FormDialog
-          cancelLabel={t("cancel")}
-          formActions
-          onOpenChange={(open) => {
-            if (!open) {
-              setEditor(undefined);
-            }
-          }}
-          open
-          title={t(editorTitle(editor))}
-          wide={editor.kind === "template"}
-        >
-          {editor.kind === "field" ? (
-            <CatalogFieldForm
-              csrfToken={csrfToken}
-              item={editor.item}
-              onSaved={() => setEditor(undefined)}
-              scope={scope}
-            />
-          ) : (
-            <CatalogTemplateForm
-              copy={editor.copy}
-              csrfToken={csrfToken}
-              item={editor.item}
-              items={items}
-              onSaved={() => setEditor(undefined)}
-              scope={scope}
-            />
-          )}
-        </FormDialog>
+        <CatalogEditorDialog
+          csrfToken={csrfToken}
+          editor={editor}
+          items={items}
+          onClose={() => setEditor(undefined)}
+          scope={scope}
+        />
       )}
     </div>
   );
 }
-
-function editorTitle(editor: Editor) {
-  if (editor.kind === "field") {
-    return editor.item ? "editField" : "newField";
-  }
-  return editor.item ? "editTemplate" : "newTemplate";
-}
diff --git a/modules/resources/src/web/catalog-template-create-dialog.tsx b/modules/resources/src/web/catalog-template-create-dialog.tsx
new file mode 100644
index 0000000..bb2e38f
--- /dev/null
+++ b/modules/resources/src/web/catalog-template-create-dialog.tsx
@@ -0,0 +1,41 @@
+import { FormDialog } from "@repo/shadcn-ui/components/form-dialog";
+import type { ComponentProps } from "react";
+import { useTranslation } from "react-i18next";
+
+import { CatalogTemplateForm } from "./catalog-template-form";
+
+export function CatalogTemplateCreateDialog({
+  scope,
+  csrfToken,
+  items,
+  onSaved,
+  onOpenChange,
+}: {
+  scope: string;
+  csrfToken: string;
+  items: ComponentProps<typeof CatalogTemplateForm>["items"];
+  onSaved: (id: string) => void;
+  onOpenChange: (open: boolean) => void;
+}) {
+  const { t } = useTranslation("resources");
+
+  return (
+    <FormDialog
+      cancelLabel={t("cancel")}
+      formActions
+      onOpenChange={onOpenChange}
+      open
+      title={t("newTemplate")}
+      wide
+    >
+      <p className="text-sm text-muted-foreground">{t("relatedNotice")}</p>
+      <CatalogTemplateForm
+        allowQuickCreate={false}
+        csrfToken={csrfToken}
+        items={items}
+        onSaved={onSaved}
+        scope={scope}
+      />
+    </FormDialog>
+  );
+}
diff --git a/modules/resources/src/web/catalog-template-form.tsx b/modules/resources/src/web/catalog-template-form.tsx
index ebed07a..5976717 100644
--- a/modules/resources/src/web/catalog-template-form.tsx
+++ b/modules/resources/src/web/catalog-template-form.tsx
@@ -1,7 +1,7 @@
 import { zodResolver } from "@hookform/resolvers/zod";
 import { Button } from "@repo/shadcn-ui/components/button";
 import { Checkbox } from "@repo/shadcn-ui/components/checkbox";
-import { FormActions, FormDialog } from "@repo/shadcn-ui/components/form-dialog";
+import { FormActions } from "@repo/shadcn-ui/components/form-dialog";
 import { Input } from "@repo/shadcn-ui/components/input";
 import { Label } from "@repo/shadcn-ui/components/label";
 import { SelectWithAction } from "@repo/shadcn-ui/components/select-with-action";
@@ -15,7 +15,7 @@ import type { CatalogItemDTO } from "../common";
 import { ResourceDefinitionSchema } from "../common";
 
 import { CatalogError } from "./catalog-error";
-import { CatalogFieldForm } from "./catalog-form";
+import { CatalogFieldCreateDialog } from "./catalog-field-create-dialog";
 import { CatalogHelp } from "./catalog-help";
 import type { CatalogSaved } from "./use-catalog-save";
 import { useCatalogSave } from "./use-catalog-save";
@@ -196,27 +196,19 @@ export function CatalogTemplateForm({
         </FormActions>
       </form>
       {creatingField && (
-        <FormDialog
-          cancelLabel={t("cancel")}
-          formActions
+        <CatalogFieldCreateDialog
+          csrfToken={csrfToken}
           onOpenChange={(open) => {
             if (!open) {
               setCreatingField(false);
             }
           }}
-          open
-          title={t("newField")}
-        >
-          <p className="text-sm text-muted-foreground">{t("quickNotice")}</p>
-          <CatalogFieldForm
-            csrfToken={csrfToken}
-            onSaved={(fieldId) => {
-              add(fieldId);
-              setCreatingField(false);
-            }}
-            scope={scope}
-          />
-        </FormDialog>
+          onSaved={(fieldId) => {
+            add(fieldId);
+            setCreatingField(false);
+          }}
+          scope={scope}
+        />
       )}
     </>
   );
diff --git a/modules/resources/src/web/resource-detail-dialog.tsx b/modules/resources/src/web/resource-detail-dialog.tsx
new file mode 100644
index 0000000..4341d89
--- /dev/null
+++ b/modules/resources/src/web/resource-detail-dialog.tsx
@@ -0,0 +1,38 @@
+import { FormDialog } from "@repo/shadcn-ui/components/form-dialog";
+import type { ComponentProps, ReactNode } from "react";
+import { useTranslation } from "react-i18next";
+
+import { ResourceDetail } from "./resource-detail";
+
+export function ResourceDetailDialog({
+  resource,
+  references,
+  relatedContent,
+  onClose,
+}: {
+  resource: ComponentProps<typeof ResourceDetail>["resource"];
+  references: NonNullable<ComponentProps<typeof ResourceDetail>["references"]>;
+  relatedContent:
+    | ((resource: ComponentProps<typeof ResourceDetail>["resource"]) => ReactNode)
+    | undefined;
+  onClose: () => void;
+}) {
+  const { t } = useTranslation("resources");
+
+  return (
+    <FormDialog
+      cancelLabel={t("close")}
+      onOpenChange={(open) => {
+        if (!open) {
+          onClose();
+        }
+      }}
+      open
+      title={resource.values.name}
+      wide
+    >
+      <ResourceDetail references={references} resource={resource} />
+      {relatedContent?.(resource)}
+    </FormDialog>
+  );
+}
diff --git a/modules/resources/src/web/resource-editor-dialog.tsx b/modules/resources/src/web/resource-editor-dialog.tsx
new file mode 100644
index 0000000..18f200d
--- /dev/null
+++ b/modules/resources/src/web/resource-editor-dialog.tsx
@@ -0,0 +1,46 @@
+import { FormDialog } from "@repo/shadcn-ui/components/form-dialog";
+import type { ComponentProps } from "react";
+import { useTranslation } from "react-i18next";
+
+import { ResourceForm } from "./resource-form";
+
+export function ResourceEditorDialog({
+  resource,
+  companyId,
+  csrfToken,
+  items,
+  onClose,
+  onSaved,
+}: {
+  resource: ComponentProps<typeof ResourceForm>["resource"];
+  companyId: string;
+  csrfToken: string;
+  items: ComponentProps<typeof ResourceForm>["items"];
+  onClose: () => void;
+  onSaved: (id: string) => void;
+}) {
+  const { t } = useTranslation("resources");
+
+  return (
+    <FormDialog
+      cancelLabel={t("cancel")}
+      formActions
+      onOpenChange={(open) => {
+        if (!open) {
+          onClose();
+        }
+      }}
+      open
+      title={t(resource ? "editResource" : "newResource")}
+      wide
+    >
+      <ResourceForm
+        companyId={companyId}
+        csrfToken={csrfToken}
+        items={items}
+        onSaved={onSaved}
+        resource={resource}
+      />
+    </FormDialog>
+  );
+}
diff --git a/modules/resources/src/web/resource-form.tsx b/modules/resources/src/web/resource-form.tsx
index 26fe078..b765be4 100644
--- a/modules/resources/src/web/resource-form.tsx
+++ b/modules/resources/src/web/resource-form.tsx
@@ -1,7 +1,7 @@
 import { zodResolver } from "@hookform/resolvers/zod";
 import { Button } from "@repo/shadcn-ui/components/button";
 import { ContextHelp } from "@repo/shadcn-ui/components/context-help";
-import { FormActions, FormDialog } from "@repo/shadcn-ui/components/form-dialog";
+import { FormActions } from "@repo/shadcn-ui/components/form-dialog";
 import { Input } from "@repo/shadcn-ui/components/input";
 import { Label } from "@repo/shadcn-ui/components/label";
 import { SelectWithAction } from "@repo/shadcn-ui/components/select-with-action";
@@ -15,7 +15,7 @@ import type { CatalogItemDTO } from "../common";
 import type { ResourceDTO, ResourceInput } from "../common/inventory";
 import { ResourceInputSchema } from "../common/inventory";
 
-import { CatalogTemplateForm } from "./catalog-template-form";
+import { CatalogTemplateCreateDialog } from "./catalog-template-create-dialog";
 import { inventoryApi, inventoryKeys } from "./inventory-api";
 import { InventoryFeedback } from "./inventory-feedback";
 import { ResourceCharacteristicControl } from "./resource-characteristic-control";
@@ -246,31 +246,21 @@ export function ResourceForm({
         </FormActions>
       </form>
       {creatingTemplate && (
-        <FormDialog
-          cancelLabel={t("cancel")}
-          formActions
+        <CatalogTemplateCreateDialog
+          csrfToken={csrfToken}
+          items={items}
           onOpenChange={(open) => {
             if (!open) {
               setCreatingTemplate(false);
             }
           }}
-          open
-          title={t("newTemplate")}
-          wide
-        >
-          <p className="text-sm text-muted-foreground">{t("relatedNotice")}</p>
-          <CatalogTemplateForm
-            allowQuickCreate={false}
-            csrfToken={csrfToken}
-            items={items}
-            onSaved={(id) => {
-              form.setValue("templateId", id);
-              form.setValue("characteristics", {});
-              setCreatingTemplate(false);
-            }}
-            scope={companyId}
-          />
-        </FormDialog>
+          onSaved={(id) => {
+            form.setValue("templateId", id);
+            form.setValue("characteristics", {});
+            setCreatingTemplate(false);
+          }}
+          scope={companyId}
+        />
       )}
     </>
   );
diff --git a/modules/resources/src/web/resources-page.tsx b/modules/resources/src/web/resources-page.tsx
index c08c007..e56053b 100644
--- a/modules/resources/src/web/resources-page.tsx
+++ b/modules/resources/src/web/resources-page.tsx
@@ -6,7 +6,6 @@ import {
   EntityStatus,
   EntityTable,
 } from "@repo/shadcn-ui/components/entity-list";
-import { FormDialog } from "@repo/shadcn-ui/components/form-dialog";
 import { useQuery } from "@tanstack/react-query";
 import type { ReactNode } from "react";
 import { useState } from "react";
@@ -17,8 +16,8 @@ import type { ResourceDTO } from "../common";
 import { catalogApi, catalogKeys } from "./catalog-api";
 import { inventoryApi, inventoryKeys } from "./inventory-api";
 import { InventoryFeedback } from "./inventory-feedback";
-import { ResourceDetail } from "./resource-detail";
-import { ResourceForm } from "./resource-form";
+import { ResourceDetailDialog } from "./resource-detail-dialog";
+import { ResourceEditorDialog } from "./resource-editor-dialog";
 
 export function ResourcesPage({
   companyId,
@@ -144,45 +143,25 @@ export function ResourcesPage({
         unavailable={(!query.data && query.isError) || (!catalog.data && catalog.isError)}
       />
       {editor && catalog.data && (
-        <FormDialog
-          cancelLabel={t("cancel")}
-          formActions
-          onOpenChange={(open) => {
-            if (!open) {
-              setEditor(undefined);
-            }
+        <ResourceEditorDialog
+          companyId={companyId}
+          csrfToken={csrfToken}
+          items={catalog.data.items}
+          onClose={() => setEditor(undefined)}
+          onSaved={(id) => {
+            setEditor(undefined);
+            setViewId(id);
           }}
-          open
-          title={t(edited ? "editResource" : "newResource")}
-          wide
-        >
-          <ResourceForm
-            companyId={companyId}
-            csrfToken={csrfToken}
-            items={catalog.data.items}
-            onSaved={(id) => {
-              setEditor(undefined);
-              setViewId(id);
-            }}
-            resource={edited}
-          />
-        </FormDialog>
+          resource={edited}
+        />
       )}
       {viewed && (
-        <FormDialog
-          cancelLabel={t("close")}
-          onOpenChange={(open) => {
-            if (!open) {
-              setViewId(undefined);
-            }
-          }}
-          open
-          title={viewed.values.name}
-          wide
-        >
-          <ResourceDetail references={query.data?.references ?? []} resource={viewed} />
-          {relatedContent?.(viewed)}
-        </FormDialog>
+        <ResourceDetailDialog
+          onClose={() => setViewId(undefined)}
+          references={query.data?.references ?? []}
+          relatedContent={relatedContent}
+          resource={viewed}
+        />
       )}
     </div>
   );