Feat 923: Компонент пользователи для админ панели.#1048
Open
Belato-code wants to merge 4 commits intohexlet-volunteers:mainfrom
Open
Feat 923: Компонент пользователи для админ панели.#1048Belato-code wants to merge 4 commits intohexlet-volunteers:mainfrom
Belato-code wants to merge 4 commits intohexlet-volunteers:mainfrom
Conversation
Belato-code
changed the title
aisaenok
suggested changes
Mar 20, 2026
Contributor
aisaenok
left a comment
aisaenok
left a comment
There was a problem hiding this comment.
убрать дублирование логики подписки
типизировать activeTab через union
починить поиск через trim()
не использовать label="" у Select
Author
|
Подправил компонент, конфликт что был с json я оставил изменения что шли от main ветки. |
aisaenok
approved these changes
Mar 26, 2026
Contributor
aisaenok
left a comment
aisaenok
left a comment
There was a problem hiding this comment.
Несколько замечаний оставил
Contributor
There was a problem hiding this comment.
индекс файлы внутри сегментов не делаем
| <Badge color="gray" variant="light" fw={500}>{t('adminPage.users.sub.noSub')}</Badge> | ||
| ) | ||
|
|
||
| const badge = getSubscriptionStatus(user) === 'active' |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Исправил замечания при создании компонента Пользователи в админ панель. Были доработаны функции. Типы перенесены в entities, моки от меню перенес в отдельный файл. Откатил версию msw до 2.12.4. Фильтр тоже подправил, теперь поиск по строке идет как дополнительный. Сначала по табам, потом по строке.
