RSHB/arm-core
9
0
Fork 0
Code Issues 24 Pull Requests 1 Actions Packages Projects Releases Wiki Activity

fix(web): синхронизация встроенного фронта с arm-web@test (8345f5e) (#137) #138

Merged
aep merged 1 commits from feat/137-web-sync-8345f5e into main 2026-10-19 10:39:25 +03:00
Conversation 0 Commits 1 Files Changed 41 +2479 -33
aep commented 2026-10-19 10:35:45 +03:00
Owner
Copy Link

Закрывает #137.

Встроенный фронт arm-core/web отставал от RSHB/arm-web@test (8345f5e). Диапазон arm-web 46639b1..8345f5e
перенесён скриптом docs/scripts/sync-web.sh без правок; после переноса web/ и arm-web идентичны по набору синхронизации.

Коммиты arm-web (9):

  • 5b13b74 Форматирование под ESLint + Prettier, зелёный make check (#31)
  • 681697f fixed eslint bugs
  • 25d2211 fixed bugs
  • 2cddb55 Форматирование под ESLint + Prettier и зелёный make check (#31)
  • 71dae21 updated company group and forms
  • 83d4c2b added company group table
  • d2dc230 fixed merge bug
  • 3977dae added forms for catalogue jur
  • 8e8e46e addded legalEntities table and move form

Файлы (41):

  • web/src/App.tsx
  • web/src/api/client.ts
  • web/src/components/TableTag/presets.tsx
  • web/src/hooks/useVirtualList.tsx
  • web/src/index.tsx
  • web/src/layouts/CatalogueGroups.tsx
  • web/src/layouts/CatalogueJur.tsx
  • web/src/services/api/directories/catalogue_jur.ts
  • web/src/services/api/directories/company_groups.ts
  • web/src/services/api/directories/related-groups.ts
  • web/src/store/slices/catalogueJurSlice/catalogueJurSlice.ts
  • web/src/store/slices/catalogueJurSlice/thunks.ts
  • web/src/store/slices/catalogueJurSlice/types.ts
  • web/src/store/slices/companyGroupsSlice/companyGroupsSlice.ts
  • web/src/store/slices/companyGroupsSlice/types.ts
  • web/src/store/store.ts
  • web/src/types/api.ts
  • web/src/types/catalogueJur/catalogueJur.ts
  • web/src/types/companyGroups/companyGroups.ts
  • web/src/types/relatedGroup/relatedGroup.ts
  • web/src/utils/labels.test.ts
  • web/src/utils/labels.ts
  • web/src/utils/useNotification.tsx
  • web/src/widgets/Admin/UsersTable.tsx
  • web/src/widgets/CataloguGroupTabs/CataloguGroupTabs.css
  • web/src/widgets/CataloguGroupTabs/CataloguGroupTabs.tsx
  • web/src/widgets/CatalogueGroupHeader/CatalogueGroupHeader.tsx
  • web/src/widgets/CatalogueJurForm/CatalogueJurForm.tsx
  • web/src/widgets/CatalogueJurTable/CatalogueJurTable.tsx
  • web/src/widgets/CatalogueJurTable/config.tsx
  • web/src/widgets/CompanyGroupForm/CompanyGroupForm.tsx
  • web/src/widgets/CompanyGroupsList/CompanyGroupsList.css
  • web/src/widgets/CompanyGroupsList/CompanyGroupsList.tsx
  • web/src/widgets/CreateEntityPickerModal/CreateEntityPickerModal.css
  • web/src/widgets/CreateEntityPickerModal/CreateEntityPickerModal.tsx
  • web/src/widgets/DeleteRelatedGroupModal/DeleteRelatedGroupModal.tsx
  • web/src/widgets/MoveCatalogueJurForm/MoveCatalogueJurForm.tsx
  • web/src/widgets/RelatedGroupForm/RelatedGroupForm.tsx
  • web/src/widgets/RelatedGroupTable/RelatedGroupTable.tsx
  • web/src/widgets/RelatedGroupTable/config.tsx
  • web/src/widgets/WithdrawCatalogueJurForm/WithdrawCatalogueJurForm.tsx

Проверки в worktree: Tests 324 passed (324); tsc --noEmit чисто; biome check src — 7 предупреждений (на main — 7); rsbuild build собирается.

Rulings I made

  • R-1 — служебные файлы arm-web (CLAUDE.md, .claude/, openspec/, docs/, scripts/, Makefile, ARCHITECTURE.md, .gitignore, lockfile) не переносятся: UI-спеки и демо-стенд живут в arm-web.
  • R-2 — bounded-задача без OpenSpec change: перенос готового, проревьюенного в arm-web кода.

Ревью перенесённого кода против бэкенда — за исполнителем, находки с маркерами в комментариях к PR.

🤖 Generated with Claude Code

Закрывает #137. Встроенный фронт `arm-core/web` отставал от `RSHB/arm-web@test` (8345f5e). Диапазон arm-web 46639b1..8345f5e перенесён скриптом `docs/scripts/sync-web.sh` без правок; после переноса `web/` и arm-web идентичны по набору синхронизации. Коммиты arm-web (9): - 5b13b74 Форматирование под ESLint + Prettier, зелёный make check (#31) - 681697f fixed eslint bugs - 25d2211 fixed bugs - 2cddb55 Форматирование под ESLint + Prettier и зелёный make check (#31) - 71dae21 updated company group and forms - 83d4c2b added company group table - d2dc230 fixed merge bug - 3977dae added forms for catalogue jur - 8e8e46e addded legalEntities table and move form Файлы (41): - web/src/App.tsx - web/src/api/client.ts - web/src/components/TableTag/presets.tsx - web/src/hooks/useVirtualList.tsx - web/src/index.tsx - web/src/layouts/CatalogueGroups.tsx - web/src/layouts/CatalogueJur.tsx - web/src/services/api/directories/catalogue_jur.ts - web/src/services/api/directories/company_groups.ts - web/src/services/api/directories/related-groups.ts - web/src/store/slices/catalogueJurSlice/catalogueJurSlice.ts - web/src/store/slices/catalogueJurSlice/thunks.ts - web/src/store/slices/catalogueJurSlice/types.ts - web/src/store/slices/companyGroupsSlice/companyGroupsSlice.ts - web/src/store/slices/companyGroupsSlice/types.ts - web/src/store/store.ts - web/src/types/api.ts - web/src/types/catalogueJur/catalogueJur.ts - web/src/types/companyGroups/companyGroups.ts - web/src/types/relatedGroup/relatedGroup.ts - web/src/utils/labels.test.ts - web/src/utils/labels.ts - web/src/utils/useNotification.tsx - web/src/widgets/Admin/UsersTable.tsx - web/src/widgets/CataloguGroupTabs/CataloguGroupTabs.css - web/src/widgets/CataloguGroupTabs/CataloguGroupTabs.tsx - web/src/widgets/CatalogueGroupHeader/CatalogueGroupHeader.tsx - web/src/widgets/CatalogueJurForm/CatalogueJurForm.tsx - web/src/widgets/CatalogueJurTable/CatalogueJurTable.tsx - web/src/widgets/CatalogueJurTable/config.tsx - web/src/widgets/CompanyGroupForm/CompanyGroupForm.tsx - web/src/widgets/CompanyGroupsList/CompanyGroupsList.css - web/src/widgets/CompanyGroupsList/CompanyGroupsList.tsx - web/src/widgets/CreateEntityPickerModal/CreateEntityPickerModal.css - web/src/widgets/CreateEntityPickerModal/CreateEntityPickerModal.tsx - web/src/widgets/DeleteRelatedGroupModal/DeleteRelatedGroupModal.tsx - web/src/widgets/MoveCatalogueJurForm/MoveCatalogueJurForm.tsx - web/src/widgets/RelatedGroupForm/RelatedGroupForm.tsx - web/src/widgets/RelatedGroupTable/RelatedGroupTable.tsx - web/src/widgets/RelatedGroupTable/config.tsx - web/src/widgets/WithdrawCatalogueJurForm/WithdrawCatalogueJurForm.tsx Проверки в worktree: Tests 324 passed (324); `tsc --noEmit` чисто; `biome check src` — 7 предупреждений (на main — 7); `rsbuild build` собирается. ## Rulings I made - R-1 — служебные файлы arm-web (CLAUDE.md, .claude/, openspec/, docs/, scripts/, Makefile, ARCHITECTURE.md, .gitignore, lockfile) не переносятся: UI-спеки и демо-стенд живут в arm-web. - R-2 — bounded-задача без OpenSpec change: перенос готового, проревьюенного в arm-web кода. Ревью перенесённого кода против бэкенда — за исполнителем, находки с маркерами в комментариях к PR. 🤖 Generated with [Claude Code](https://claude.com/claude-code)
aep added 1 commit 2026-10-19 10:35:46 +03:00 
Перенесён диапазон arm-web 46639b1..8345f5e (9 коммитов, 41 файлов набора
синхронизации) скриптом docs/scripts/sync-web.sh. После переноса web/ и
arm-web@test идентичны по набору. Коммиты arm-web:
- 5b13b74 Форматирование под ESLint + Prettier, зелёный make check (#31)
- 681697f fixed eslint bugs
- 25d2211 fixed bugs
- 2cddb55 Форматирование под ESLint + Prettier и зелёный make check (#31)
- 71dae21 updated company group and forms
- 83d4c2b added company group table
- d2dc230 fixed merge bug
- 3977dae added forms for catalogue jur
- 8e8e46e addded legalEntities table and move form

Co-Authored-By: sync-web.sh <noreply@aepif.ru>
aep merged commit e570278528 into main 2026-10-19 10:39:25 +03:00
Sign in to join this conversation.
Reviewers
No Reviewers
Labels
No items
No Label
Milestone
No items
No Milestone
Projects
Clear projects
No project
Assignees
Clear assignees
PotapovaA Raykov-MS SalminMP Veronika Yashin1994 aep grog maxim tsygankoviva
No Assignees
1 Participants
Notifications
Due Date
No due date set.
Dependencies

No dependencies set.

Reference: RSHB/arm-core#138
No description provided.
Delete Branch "feat/137-web-sync-8345f5e"

Deleting a branch is permanent. Although the deleted branch may continue to exist for a short time before it actually gets removed, it CANNOT be undone in most cases. Continue?