Alexandre Brandizzi
bff5ed138b
Merge branch 'dev' into fix/ab/sh-339-wizard-complete-image
2026-09-17 15:30:22 -03:00
Alexandre Brandizzi
3a6f101776
Merge branch 'dev' into fix/ab/sh-368-completion-uploads
2026-09-17 15:30:20 -03:00
Alexandre Brandizzi
d53507731e
Merge branch 'dev' into feat/ab/sh-326-team-member
2026-09-17 15:30:16 -03:00
Codex Review Integration
abe28a3a7f
Merge remote-tracking branch 'origin/dev' into fix/ab/sh-364-inline-technician-registration
...
# Conflicts:
# src/app/(protected)/workorders/_components/wizard/use-new-wo-wizard-controller.ts
# src/app/(protected)/workorders/_components/wizard/wizard-step-location-service-select.tsx
# src/app/(protected)/workorders/_components/wizard/wizard-step-vendor-time.tsx
# src/test/app/(protected)/workorders/wizard-service-clears-vendor.test.tsx
2026-09-17 15:27:39 -03:00
Alexandre Brandizzi
948ce278de
Merge branch 'dev' into fix/ab/sh-339-wizard-complete-image
2026-09-17 15:16:30 -03:00
Alexandre Brandizzi
b9c3b11a74
Merge branch 'dev' into fix/ab/sh-368-completion-uploads
2026-09-17 15:16:27 -03:00
Alexandre Brandizzi
9ed8099e71
Merge branch 'dev' into feat/ab/sh-304-services-registry-ui
2026-09-17 15:16:25 -03:00
Alexandre Brandizzi
6eacdc09f6
Merge branch 'dev' into feat/ab/sh-336-dashboard
2026-09-17 15:16:22 -03:00
Alexandre Brandizzi
873e3e32de
Merge branch 'dev' into feat/ab/sh-326-team-member
2026-09-17 15:16:18 -03:00
Alexandre Brandizzi
361f6b65a2
Merge branch 'dev' into feat/ab/sh-304-services-registry-ui
2026-09-17 15:10:25 -03:00
Alexandre Brandizzi
0876e9c3f0
Merge branch 'dev' into feat/ab/sh-336-dashboard
2026-09-17 15:10:22 -03:00
Alexandre Brandizzi
5b6991c93a
Merge branch 'dev' into feat/ab/sh-326-team-member
2026-09-17 15:10:19 -03:00
Alexandre Brandizzi
bca906f900
Merge branch 'dev' into fix/ab/sh-339-wizard-complete-image
2026-09-17 15:02:23 -03:00
Alexandre Brandizzi
534d7ce4d6
Merge branch 'dev' into fix/ab/sh-364-inline-technician-registration
2026-09-17 15:02:19 -03:00
Alexandre Brandizzi
f5da80cd6e
Merge branch 'dev' into fix/ab/sh-368-completion-uploads
2026-09-17 15:02:16 -03:00
Alexandre Brandizzi
bf916019f9
Merge branch 'dev' into fix/ab/sh-321-wizard-vendor-notes
2026-09-17 15:02:13 -03:00
Alexandre Brandizzi
8d2c947c54
Merge branch 'dev' into fix/ab/sh-339-wizard-complete-image
2026-09-17 14:48:30 -03:00
Alexandre Brandizzi
65d55d7c9f
Merge branch 'dev' into fix/ab/sh-364-inline-technician-registration
2026-09-17 14:48:26 -03:00
Alexandre Brandizzi
b149d3c275
Merge branch 'dev' into fix/ab/sh-368-completion-uploads
2026-09-17 14:48:23 -03:00
Alexandre Brandizzi
318859fb1b
Merge branch 'dev' into fix/ab/sh-321-wizard-vendor-notes
2026-09-17 14:48:19 -03:00
Alexandre Brandizzi
ff4ecb37e4
Merge branch 'dev' into feat/ab/sh-304-services-registry-ui
2026-09-17 14:48:16 -03:00
Alexandre Brandizzi
2d5e7cdd42
Merge branch 'dev' into fix/ab/frontend-test-stability
2026-09-17 14:48:13 -03:00
Codex Review Integration
827d52add7
Merge remote-tracking branch 'origin/dev' into feat/ab/sh-326-team-member
2026-09-17 14:36:45 -03:00
Alexandre Brandizzi
1a76f270ea
Merge branch 'dev' into fix/ab/sh-339-wizard-complete-image
2026-09-17 14:34:46 -03:00
Alexandre Brandizzi
0eeae02785
Merge branch 'dev' into fix/ab/sh-364-inline-technician-registration
2026-09-17 14:34:43 -03:00
Alexandre Brandizzi
130f5830ce
Merge branch 'dev' into fix/ab/sh-368-completion-uploads
2026-09-17 14:34:40 -03:00
Alexandre Brandizzi
b48d1a24be
Merge branch 'dev' into fix/ab/sh-321-wizard-vendor-notes
2026-09-17 14:34:36 -03:00
Alexandre Brandizzi
0302b2828f
Merge branch 'dev' into feat/ab/sh-304-services-registry-ui
2026-09-17 14:34:33 -03:00
Alexandre Brandizzi
c614d43900
Merge branch 'dev' into feat/ab/sh-336-dashboard
2026-09-17 14:34:30 -03:00
Alexandre Brandizzi
99481c49e9
Merge branch 'dev' into feat/ab/sh-207-uplift-queue-frontend
2026-09-17 14:34:27 -03:00
Alexandre Brandizzi
6c88df6c5f
Merge branch 'dev' into fix/ab/frontend-test-stability
2026-09-17 14:34:24 -03:00
Alexandre Brandizzi
09c2447094
Merge branch 'dev' into fix/ab/sh-339-wizard-complete-image
2026-09-17 14:26:43 -03:00
Alexandre Brandizzi
3dbf3df5d5
Merge branch 'dev' into fix/ab/sh-364-inline-technician-registration
2026-09-17 14:26:40 -03:00
Alexandre Brandizzi
40779566c3
Merge branch 'dev' into fix/ab/sh-368-completion-uploads
2026-09-17 14:26:37 -03:00
Alexandre Brandizzi
e5df5b46c0
Merge branch 'dev' into fix/ab/sh-321-wizard-vendor-notes
2026-09-17 14:26:33 -03:00
Alexandre Brandizzi
3011cb1eda
Merge branch 'dev' into feat/ab/sh-304-services-registry-ui
2026-09-17 14:26:30 -03:00
Alexandre Brandizzi
b2b25d7bae
Merge branch 'dev' into feat/ab/sh-336-dashboard
2026-09-17 14:26:27 -03:00
Alexandre Brandizzi
2f659bb6cd
Merge branch 'dev' into feat/ab/sh-326-team-member
2026-09-17 14:26:24 -03:00
Alexandre Brandizzi
1a13787ecb
Merge branch 'dev' into feat/ab/sh-207-uplift-queue-frontend
2026-09-17 14:26:21 -03:00
Alexandre Brandizzi
a81fd14d7d
Merge branch 'dev' into feat/ab/sh-325-add-team-member
2026-09-17 14:20:16 -03:00
Alexandre Brandizzi
3550b64ba3
Merge branch 'dev' into fix/ab/frontend-test-stability
2026-09-17 14:20:12 -03:00
Codex Review Integration
90a3c24846
fix(services): source Trade picker from canonical catalog (SH-304)
...
The Trade select was fed from the editable DropdownOptions "Trade"
category, whose legacy seed values ("Plumbing", "General", ...) are not
in the backend TradeCatalog. ServicesRegistryService.RequireCanonicalTrade
rejects any non-canonical trade with 400 TradeInvalid, so Add Service and
Save Changes failed for legacy names and an admin editing the Trade
dropdown could break service creation at any time.
Source the picker from the server-owned canonical Trade reference on
Vendor/facets (the same list the vendor roster form uses), key the icon
defaults to the canonical names, and keep the edited service's stored
trade selectable if it was later deactivated so editing never silently
blanks the field.
2026-09-17 14:14:48 -03:00
Alexandre Brandizzi
0055f5c3b9
Merge branch 'dev' into fix/ab/frontend-test-stability
2026-09-17 14:04:21 -03:00
Alexandre Brandizzi
8d2adb4472
Merge branch 'dev' into fix/ab/sh-375-edit-error-copy
2026-09-17 14:04:19 -03:00
Codex Review Integration
8bc6c5e687
Merge remote-tracking branch 'origin/dev' into feat/ab/sh-326-team-member
...
# Conflicts:
# e2e/__screenshots__/vendors/vendors.visual.spec.ts/vendor-error.png
2026-09-17 14:00:03 -03:00
Codex Review Integration
a65f282b51
Merge remote-tracking branch 'origin/dev' into feat/ab/sh-325-add-team-member
2026-09-17 13:47:06 -03:00
Alexandre Brandizzi
d6518bc065
Merge branch 'dev' into feat/ab/sh-324-team-members-list
2026-09-17 13:28:10 -03:00
Codex Review Integration
c40f0c4a37
Merge remote-tracking branch 'origin/dev' into fix/ab/sh-364-inline-technician-registration
...
# Conflicts:
# src/app/(protected)/workorders/_components/wizard/use-new-wo-wizard-controller.ts
2026-09-17 13:26:17 -03:00
Codex Review Integration
7dd7ea497e
Merge remote-tracking branch 'origin/dev' into feat/ab/sh-304-services-registry-ui
...
# Conflicts:
# src/api/api-paths.ts
# src/domain/services/api/services-api.ts
# src/domain/services/mappers/service-mapper.ts
# src/domain/services/types/service.ts
# src/infra/query-key/query-key.ts
# src/test/domain/services/api/services-api.test.ts
2026-09-17 13:24:08 -03:00
Codex Review Integration
dee81b0a44
Merge remote-tracking branch 'origin/dev' into fix/ab/sh-321-wizard-vendor-notes
...
# Conflicts:
# src/app/(protected)/workorders/_components/wizard/use-new-wo-wizard-controller.ts
2026-09-17 13:20:31 -03:00
