Commit baeb7bd
committed
Merge origin/main into samejr/org-menu-update
Resolves conflicts across the side menu files against main's Tailwind v3 to v4 migration: keep the side menu redesign, resize, keyboard-focus, and account/help menu work; adopt v4 class syntax (h-8! important suffix) and main's functional additions (environment list revalidate-on-open, changelog URL sanitizing). tailwind.config.js is removed (v4 config lives in tailwind.css) and the focus ring inset is re-applied there.945 files changed
Lines changed: 80071 additions & 19422 deletions
File tree
- .changeset
- .claude/rules
- .github
- workflows
- .server-changes
- apps
- coordinator
- src
- docker-provider
- src
- kubernetes-provider
- src
- supervisor
- src
- webapp
- app
- components
- admin
- backOffice
- billing
- code
- dashboard-agent
- environments
- errors
- integrations
- layout
- logs
- metrics
- onboarding
- primitives
- TreeView
- charts
- query
- runs/v3
- agent
- ai
- run
- scheduled
- schedules
- sessions/v1
- hooks
- models
- presenters/v3
- routes
- _app.orgs.$organizationId.subscription.v3.free_connect_failed
- _app.orgs.$organizationId.subscription.v3.free_connect_success
- _app.orgs.$organizationSlug.invite
- _app.orgs.$organizationSlug.projects.$projectParam.env.$envParam._index
- _app.orgs.$organizationSlug.projects.$projectParam.env.$envParam.agents.$agentParam
- _app.orgs.$organizationSlug.projects.$projectParam.env.$envParam.alerts.new
- _app.orgs.$organizationSlug.projects.$projectParam.env.$envParam.alerts
- _app.orgs.$organizationSlug.projects.$projectParam.env.$envParam.batches.$batchParam
- _app.orgs.$organizationSlug.projects.$projectParam.env.$envParam.batches
- _app.orgs.$organizationSlug.projects.$projectParam.env.$envParam.branches
- _app.orgs.$organizationSlug.projects.$projectParam.env.$envParam.bulk-actions.$bulkActionParam
- _app.orgs.$organizationSlug.projects.$projectParam.env.$envParam.bulk-actions
- _app.orgs.$organizationSlug.projects.$projectParam.env.$envParam.concurrency
- _app.orgs.$organizationSlug.projects.$projectParam.env.$envParam.dashboards.$dashboardKey
- _app.orgs.$organizationSlug.projects.$projectParam.env.$envParam.dashboards._index
- _app.orgs.$organizationSlug.projects.$projectParam.env.$envParam.dashboards.custom.$dashboardId
- _app.orgs.$organizationSlug.projects.$projectParam.env.$envParam.deployments.$deploymentParam
- _app.orgs.$organizationSlug.projects.$projectParam.env.$envParam.deployments
- _app.orgs.$organizationSlug.projects.$projectParam.env.$envParam.dev-branches
- _app.orgs.$organizationSlug.projects.$projectParam.env.$envParam.environment-variables.new
- _app.orgs.$organizationSlug.projects.$projectParam.env.$envParam.environment-variables
- _app.orgs.$organizationSlug.projects.$projectParam.env.$envParam.errors.$fingerprint
- _app.orgs.$organizationSlug.projects.$projectParam.env.$envParam.errors._index
- _app.orgs.$organizationSlug.projects.$projectParam.env.$envParam.errors
- _app.orgs.$organizationSlug.projects.$projectParam.env.$envParam.models._index
- _app.orgs.$organizationSlug.projects.$projectParam.env.$envParam.playground.$agentParam
- _app.orgs.$organizationSlug.projects.$projectParam.env.$envParam.prompts.$promptSlug
- _app.orgs.$organizationSlug.projects.$projectParam.env.$envParam.prompts._index
- _app.orgs.$organizationSlug.projects.$projectParam.env.$envParam.query
- _app.orgs.$organizationSlug.projects.$projectParam.env.$envParam.queues
- _app.orgs.$organizationSlug.projects.$projectParam.env.$envParam.regions
- _app.orgs.$organizationSlug.projects.$projectParam.env.$envParam.runs.$runParam
- _app.orgs.$organizationSlug.projects.$projectParam.env.$envParam.runs._index
- _app.orgs.$organizationSlug.projects.$projectParam.env.$envParam.sessions.$sessionParam
- _app.orgs.$organizationSlug.projects.$projectParam.env.$envParam.tasks.dashboard
- _app.orgs.$organizationSlug.projects.$projectParam.env.$envParam.tasks.scheduled.$taskParam
- _app.orgs.$organizationSlug.projects.$projectParam.env.$envParam.tasks.standard.$taskParam
- _app.orgs.$organizationSlug.projects.$projectParam.env.$envParam.test.tasks.$taskParam
- _app.orgs.$organizationSlug.projects.$projectParam.env.$envParam.waitpoints.tokens.$waitpointParam
- _app.orgs.$organizationSlug.projects.$projectParam.env.$envParam.waitpoints.tokens
- _app.orgs.$organizationSlug.settings._index
- _app.orgs.$organizationSlug.settings.private-connections._index
- _app.orgs.$organizationSlug.settings.private-connections.new
- _app.orgs.$organizationSlug.settings.roles
- _app.orgs.$organizationSlug.settings.sso
- _app.orgs.$organizationSlug.settings.team
- _app.orgs.$organizationSlug.settings.usage
- _app.orgs.$organizationSlug_.projects.new
- _app.orgs.$organizationSlug_.select-plan
- _app.orgs.new
- _app.timezones
- account.authorization-code.$authorizationCode
- account.security
- account.tokens
- login._index
- login.magic
- login.mfa
- login.sso
- resources.orgs.$organizationSlug.projects.$projectParam.env.$envParam.runs.$runParam.spans.$spanParam
- resources.orgs.$organizationSlug.projects.$projectParam.env.$envParam.runs.$runParam.streams.$streamKey
- resources.orgs.$organizationSlug.projects.$projectParam.env.$envParam.schedules.new
- resources.orgs.$organizationSlug.projects.$projectParam.env.$envParam.waitpoints.$waitpointFriendlyId.complete
- storybook.agent-ui
- storybook.animated-panel
- storybook.buttons
- storybook.charts
- storybook.detail-cell
- storybook.page-header
- storybook.popover
- storybook.spinner
- storybook.streamdown
- storybook.table
- storybook.tabs.$tabNumber
- storybook.tabs
- storybook.timeline
- storybook.tree-view
- storybook.tsql-editor
- storybook.unordered-list
- storybook
- runEngine
- concerns
- services
- services
- mfa
- realtime
- runsRepository
- utils
- v3
- eventRepository
- runOpsMigration
- services
- alerts
- billingLimit
- bulk
- worker
- utils
- test
- components
- engine
- helpers
- presenters
- realtime
- utils
- v3/runOpsMigration
- docker
- scripts
- docs
- ai-chat
- config/extensions
- guides/example-projects
- images
- management/bulk-actions
- runs
- self-hosting
- env
- hosting
- docker
- webapp
- worker
- k8s/helm
- templates
- internal-packages
- clickhouse
- schema
- src
- client
- database
- prisma
- migrations
- 20260626140000_drop_bulk_action_item_group_fk
- 20260626150000_drop_batch_task_run_environment_fk
- 20260629120000_drop_run_ops_control_plane_foreign_keys
- 20260630120000_drop_project_alert_run_subgraph_foreign_keys
- 20260630130000_drop_task_run_to_task_run_tag_join
- 20260702120000_bulk_action_group_pending_replay_index
- 20260705210000_drop_waitpoint_run_connections_waitpoint_fk
- 20260705220000_drop_task_run_waitpoint_waitpoint_fk
- 20260705230000_drop_completed_waitpoints_waitpoint_fk
- otlp-importer
- rbac
- src
- replication/src
- run-engine/src
- engine
- systems
- tests
- run-ops-database
- prisma
- migrations
- 20260629174132_init
- 20260630000000_task_run_waitpoint_null_batchindex_partial_unique
- scripts
- src
- run-store
- src
- sso
- src
- testcontainers
- src
- tsql/src/query
- oxlint-plugins
- packages
- build
- src/extensions/core
- cli-v3
- e2e/fixtures/emit-decorator-metadata
- src
- build
- commands
- workers
- mcp
- core
- src
- v3
- apiClient
- apps
- build
- isomorphic
- runEngineWorker
- supervisor
- workload
- schemas
- serverOnly
- test
- utils
- plugins
- src
- python
- react-hooks
- redis-worker
- rsc
- schema-to-json
- trigger-sdk
- src/v3
- test
- scripts
Some content is hidden
Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
14 | 14 | | |
15 | 15 | | |
16 | 16 | | |
17 | | - | |
18 | | - | |
19 | | - | |
20 | | - | |
| 17 | + | |
| 18 | + | |
21 | 19 | | |
22 | 20 | | |
23 | 21 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
| 1 | + | |
| 2 | + | |
| 3 | + | |
| 4 | + | |
| 5 | + | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
5 | 5 | | |
6 | 6 | | |
7 | 7 | | |
8 | | - | |
| 8 | + | |
9 | 9 | | |
10 | 10 | | |
11 | 11 | | |
| |||
18 | 18 | | |
19 | 19 | | |
20 | 20 | | |
21 | | - | |
| 21 | + | |
22 | 22 | | |
23 | 23 | | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
1 | | - | |
2 | | - | |
3 | 1 | | |
4 | | - | |
5 | 2 | | |
6 | 3 | | |
7 | 4 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
7 | 7 | | |
8 | 8 | | |
9 | 9 | | |
| 10 | + | |
| 11 | + | |
| 12 | + | |
10 | 13 | | |
| 14 | + | |
| 15 | + | |
11 | 16 | | |
12 | 17 | | |
13 | 18 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
23 | 23 | | |
24 | 24 | | |
25 | 25 | | |
26 | | - | |
| 26 | + | |
| 27 | + | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
1 | | - | |
2 | | - | |
3 | | - | |
4 | | - | |
5 | 1 | | |
6 | 2 | | |
7 | | - | |
8 | | - | |
9 | | - | |
| 3 | + | |
| 4 | + | |
| 5 | + | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
18 | 18 | | |
19 | 19 | | |
20 | 20 | | |
21 | | - | |
| 21 | + | |
22 | 22 | | |
23 | 23 | | |
24 | 24 | | |
| |||
36 | 36 | | |
37 | 37 | | |
38 | 38 | | |
39 | | - | |
| 39 | + | |
40 | 40 | | |
41 | 41 | | |
42 | 42 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
20 | 20 | | |
21 | 21 | | |
22 | 22 | | |
23 | | - | |
| 23 | + | |
24 | 24 | | |
25 | 25 | | |
26 | 26 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
1 | | - | |
| 1 | + | |
2 | 2 | | |
3 | 3 | | |
4 | 4 | | |
| |||
10 | 10 | | |
11 | 11 | | |
12 | 12 | | |
13 | | - | |
| 13 | + | |
14 | 14 | | |
15 | 15 | | |
16 | 16 | | |
| |||
21 | 21 | | |
22 | 22 | | |
23 | 23 | | |
24 | | - | |
| 24 | + | |
25 | 25 | | |
26 | 26 | | |
27 | 27 | | |
| |||
48 | 48 | | |
49 | 49 | | |
50 | 50 | | |
51 | | - | |
| 51 | + | |
| 52 | + | |
| 53 | + | |
| 54 | + | |
| 55 | + | |
| 56 | + | |
| 57 | + | |
52 | 58 | | |
53 | 59 | | |
54 | 60 | | |
55 | 61 | | |
56 | | - | |
57 | | - | |
| 62 | + | |
| 63 | + | |
58 | 64 | | |
59 | | - | |
60 | | - | |
61 | | - | |
| 65 | + | |
| 66 | + | |
| 67 | + | |
62 | 68 | | |
63 | 69 | | |
64 | 70 | | |
65 | 71 | | |
66 | 72 | | |
67 | | - | |
| 73 | + | |
68 | 74 | | |
69 | 75 | | |
70 | | - | |
| 76 | + | |
| 77 | + | |
71 | 78 | | |
72 | 79 | | |
73 | 80 | | |
74 | | - | |
| 81 | + | |
75 | 82 | | |
76 | | - | |
| 83 | + | |
0 commit comments