This commit is contained in:
@@ -1,6 +1,6 @@
|
||||
import { createEffect, createSignal, Show } from 'solid-js'
|
||||
import { useData } from '../context/data'
|
||||
import type { Role } from '../graphql/generated/schema'
|
||||
import type { Role } from '../graphql/generated/graphql'
|
||||
import {
|
||||
GET_COMMUNITY_ROLE_SETTINGS_QUERY,
|
||||
GET_COMMUNITY_ROLES_QUERY,
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
import { Component, createMemo, createSignal, Show } from 'solid-js'
|
||||
import { query } from '../graphql'
|
||||
import { EnvVariable } from '../graphql/generated/schema'
|
||||
import { EnvVariable } from '../graphql/generated/graphql'
|
||||
import { ADMIN_UPDATE_ENV_VARIABLE_MUTATION } from '../graphql/mutations'
|
||||
import formStyles from '../styles/Form.module.css'
|
||||
import Button from '../ui/Button'
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
import { Component, createEffect, createSignal, For, Show } from 'solid-js'
|
||||
import type { AdminUserInfo } from '../graphql/generated/schema'
|
||||
import type { AdminUserInfo } from '../graphql/generated/graphql'
|
||||
import formStyles from '../styles/Form.module.css'
|
||||
import Button from '../ui/Button'
|
||||
import Modal from '../ui/Modal'
|
||||
@@ -76,7 +76,7 @@ const UserEditModal: Component<UserEditModalProps> = (props) => {
|
||||
email: props.user.email || '',
|
||||
name: props.user.name || '',
|
||||
slug: props.user.slug || '',
|
||||
roles: (props.user.roles || []).map((roleName) => {
|
||||
roles: (props.user.roles || []).map((roleName: string) => {
|
||||
// Сначала пробуем найти по русскому названию (для обратной совместимости)
|
||||
const russianId = ROLE_NAME_TO_ID[roleName]
|
||||
if (russianId) return russianId
|
||||
@@ -119,7 +119,7 @@ const UserEditModal: Component<UserEditModalProps> = (props) => {
|
||||
email: props.user.email || '',
|
||||
name: props.user.name || '',
|
||||
slug: props.user.slug || '',
|
||||
roles: (props.user.roles || []).map((roleName) => {
|
||||
roles: (props.user.roles || []).map((roleName: string) => {
|
||||
// Сначала пробуем найти по русскому названию (для обратной совместимости)
|
||||
const russianId = ROLE_NAME_TO_ID[roleName]
|
||||
if (russianId) return russianId
|
||||
@@ -161,7 +161,7 @@ const UserEditModal: Component<UserEditModalProps> = (props) => {
|
||||
const isCurrentlySelected = currentRoles.includes(roleId)
|
||||
|
||||
const newRoles = isCurrentlySelected
|
||||
? currentRoles.filter((r) => r !== roleId) // Убираем роль
|
||||
? currentRoles.filter((r: string) => r !== roleId) // Убираем роль
|
||||
: [...currentRoles, roleId] // Добавляем роль
|
||||
|
||||
console.log('Current roles before:', currentRoles)
|
||||
@@ -215,7 +215,7 @@ const UserEditModal: Component<UserEditModalProps> = (props) => {
|
||||
await props.onSave({
|
||||
...formData(),
|
||||
// Конвертируем ID ролей обратно в названия для сервера
|
||||
roles: (formData().roles || []).map((roleId) => ROLE_ID_TO_NAME[roleId]).join(',')
|
||||
roles: (formData().roles || []).map((roleId: string) => ROLE_ID_TO_NAME[roleId]).join(',')
|
||||
})
|
||||
props.onClose()
|
||||
} catch (error) {
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
import { Component, For } from 'solid-js'
|
||||
import type { AdminShoutInfo, Maybe, Topic } from '../graphql/generated/schema'
|
||||
import { AdminShoutInfo, Maybe, Topic } from '~/graphql/generated/graphql'
|
||||
import styles from '../styles/Modal.module.css'
|
||||
import CodePreview from '../ui/CodePreview'
|
||||
import Modal from '../ui/Modal'
|
||||
|
||||
@@ -2,7 +2,7 @@ import { Component, createSignal, For, onMount, Show } from 'solid-js'
|
||||
import type { AuthorsSortField } from '../context/sort'
|
||||
import { AUTHORS_SORT_CONFIG } from '../context/sortConfig'
|
||||
import { query } from '../graphql'
|
||||
import type { Query, AdminUserInfo as User } from '../graphql/generated/schema'
|
||||
import type { Query, AdminUserInfo as User } from '../graphql/generated/graphql'
|
||||
import { ADMIN_UPDATE_USER_MUTATION } from '../graphql/mutations'
|
||||
import { ADMIN_GET_USERS_QUERY } from '../graphql/queries'
|
||||
import UserEditModal from '../modals/RolesModal'
|
||||
|
||||
@@ -3,7 +3,7 @@ import { useData } from '../context/data'
|
||||
import { useTableSort } from '../context/sort'
|
||||
import { SHOUTS_SORT_CONFIG } from '../context/sortConfig'
|
||||
import { query } from '../graphql'
|
||||
import type { Query, AdminShoutInfo as Shout } from '../graphql/generated/schema'
|
||||
import type { Query, AdminShoutInfo as Shout } from '../graphql/generated/graphql'
|
||||
import { ADMIN_GET_SHOUTS_QUERY } from '../graphql/queries'
|
||||
import styles from '../styles/Admin.module.css'
|
||||
import HTMLEditor from '../ui/HTMLEditor'
|
||||
|
||||
@@ -33,7 +33,7 @@ const HTMLEditor = (props: HTMLEditorProps) => {
|
||||
const attemptHighlight = (attempts = 0) => {
|
||||
if (attempts > 3) return // Максимум 3 попытки
|
||||
|
||||
if (typeof window !== 'undefined' && window.Prism && element) {
|
||||
if (window?.Prism && element) {
|
||||
try {
|
||||
Prism.highlightElement(element)
|
||||
} catch (error) {
|
||||
|
||||
Reference in New Issue
Block a user