Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/Trale/miniapp-src/src/App.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -568,7 +568,7 @@ export default function App() {
case 'admin-broadcasts':
return admin(<AdminBroadcastsScreen navigate={navigate} />)
case 'admin-broadcast':
return admin(<AdminBroadcastScreen campaignKey={screen.key} useDraft={screen.draft} navigate={navigate} />)
return admin(<AdminBroadcastScreen campaignKey={screen.key} useDraft={screen.draft} pasted={screen.paste} navigate={navigate} />)
case 'admin-more':
return admin(<AdminMoreScreen navigate={navigate} />)
case 'admin-payments':
Expand Down
5 changes: 5 additions & 0 deletions src/Trale/miniapp-src/src/admin/pastedBroadcast.ts
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,11 @@ const KEYS: Record<string, keyof PastedBroadcast> = {
'имя': 'name', 'кому': 'audience', 'проба': 'sample', 'подарок': 'giftDays', 'кнопка': 'button', 'адрес': 'query'
}

/** Текст из буфера обмена; '' — если клиент Telegram читать буфер не даёт (тогда вставляют долгим нажатием в поле). */
export async function readClipboard(): Promise<string> {
try { return (await navigator.clipboard.readText()) ?? '' } catch { return '' }
}

/** Разбирает вставленный текст; строка — что не так, одной фразой. */
export function parsePastedBroadcast(raw: string): PastedBroadcast | string {
const lines = raw.replace(/\r\n?/g, '\n').split('\n')
Expand Down
22 changes: 14 additions & 8 deletions src/Trale/miniapp-src/src/screens/AdminBroadcastScreen.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import AdminPage, { phaseOf, type AdminPhase } from '../components/admin/AdminPa
import { AUDIENCES, audienceName } from '../admin/words'
import { adminBack, setInnerBack } from '../admin/adminNav'
import { draft as drafts, useDraft, useFocusMode } from '../admin/useKept'
import { parsePastedBroadcast } from '../admin/pastedBroadcast'
import { parsePastedBroadcast, readClipboard } from '../admin/pastedBroadcast'
import { adminCampaigns, ApiError, type CampaignAudience, type CampaignStatusDto } from '../api'
import type { Screen } from '../types'

Expand All @@ -19,6 +19,8 @@ interface Props {
campaignKey?: string
/** Открыть с черновиком, сохранённым на этом устройстве. */
useDraft?: boolean
/** Готовая рассылка из буфера (кнопка в списке рассылок): разобралась — сразу на отправку, нет — открыто поле с ошибкой. */
pasted?: string
navigate: (s: Screen) => void
}

Expand Down Expand Up @@ -70,7 +72,7 @@ function Preview({ message, buttonText }: { message: string; buttonText: string

interface Draft { step: number; message: string; hasButton: boolean; buttonText: string; destination: string; customQuery: string; giftDays: number; audience: CampaignAudience; sampleFirst: boolean; sampleSize: number; ownName: string }

export default function AdminBroadcastScreen({ campaignKey, useDraft: withDraft, navigate }: Props) {
export default function AdminBroadcastScreen({ campaignKey, useDraft: withDraft, pasted: fromList, navigate }: Props) {
const [saved] = useState(() => (withDraft && !campaignKey ? drafts.read<Draft>('broadcast') : null))
const [phase, setPhase] = useState<AdminPhase>(campaignKey ? 'loading' : 'ready')
const [step, setStep] = useState(campaignKey ? 5 : saved?.step ?? 1)
Expand Down Expand Up @@ -147,9 +149,10 @@ export default function AdminBroadcastScreen({ campaignKey, useDraft: withDraft,
sampleSize: sample, dryRun, ...extra
})

const applyPaste = () => {
const r = parsePastedBroadcast(pasted)
if (typeof r === 'string') { setPasteProblem(r); return }
/** Заполняет все шаги из готового текста и открывает отправку; не разобралось — поле с текстом и ошибкой. */
const applyPaste = (raw: string) => {
const r = parsePastedBroadcast(raw)
if (typeof r === 'string') { setPasting(true); setPasted(raw); setPasteProblem(raw.trim() ? r : null); return }
setMessage(r.message)
setHasButton(r.button !== null)
if (r.button) setButtonText(r.button)
Expand All @@ -167,6 +170,9 @@ export default function AdminBroadcastScreen({ campaignKey, useDraft: withDraft,
go(STEPS.length)
}

useEffect(() => { if (fromList !== undefined && !campaignKey) applyPaste(fromList) }, []) // eslint-disable-line react-hooks/exhaustive-deps
const pasteFromClipboard = async () => applyPaste(await readClipboard())

async function run(work: () => Promise<string | null>) {
setBusy(true)
setNote(null)
Expand Down Expand Up @@ -257,18 +263,18 @@ export default function AdminBroadcastScreen({ campaignKey, useDraft: withDraft,
<div className={`${small} text-right tabular-nums`}>{text.length} / 4000</div>

{!pasting ? (
<button type="button" className={action} onClick={() => setPasting(true)} data-testid="broadcast-paste-open">Вставить готовую рассылку</button>
<button type="button" className={action} onClick={pasteFromClipboard} data-testid="broadcast-paste-open">Вставить готовую из буфера</button>
) : (
<div className="jewel-tile px-4 py-3" data-testid="broadcast-paste">
<div className="relative z-[1] flex flex-col gap-2">
<div className="font-sans text-[15px] font-extrabold text-jewelInk">Готовая рассылка</div>
<div className={small}>Вставь целиком блок «имя / кому / кнопка… --- текст» — все шаги заполнятся, и откроется отправка.</div>
<div className={small}>Буфер прочитать не вышло или в нём не рассылка. Вставь сюда блок «имя / кому / кнопка… --- текст» долгим нажатием — все шаги заполнятся, и откроется отправка.</div>
<textarea className={field} rows={8} value={pasted} aria-label="Готовая рассылка" placeholder={'кому: inactiveLong\nкнопка: Открыть\n---\nТекст сообщения'}
onChange={e => { setPasted(e.target.value); setPasteProblem(null) }} />
{pasteProblem && <div className="font-sans text-[13px] text-ruby" data-testid="broadcast-paste-problem">{pasteProblem}</div>}
<div className="flex gap-2">
<button type="button" className={secondary} onClick={() => { setPasting(false); setPasteProblem(null) }}>Отмена</button>
<button type="button" className={primary} disabled={!pasted.trim()} onClick={applyPaste} data-testid="broadcast-paste-apply">Заполнить</button>
<button type="button" className={primary} disabled={!pasted.trim()} onClick={() => applyPaste(pasted)} data-testid="broadcast-paste-apply">Заполнить</button>
</div>
</div>
</div>
Expand Down
5 changes: 5 additions & 0 deletions src/Trale/miniapp-src/src/screens/AdminBroadcastsScreen.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import { useEffect, useState } from 'react'
import AdminPage, { Empty, phaseOf, type AdminPhase } from '../components/admin/AdminPage'
import { readClipboard } from '../admin/pastedBroadcast'
import { adminCampaigns, type CampaignListItemDto } from '../api'
import { audienceName, day } from '../admin/words'
import { adminBack } from '../admin/adminNav'
Expand Down Expand Up @@ -28,6 +29,10 @@ export default function AdminBroadcastsScreen({ navigate }: { navigate: (s: Scre
className="jewel-btn jewel-btn-gold w-full mb-4 font-sans text-[16px] font-extrabold">
Новая рассылка
</button>
<button type="button" onClick={async () => navigate({ kind: 'admin-broadcast', paste: await readClipboard() })} data-testid="broadcast-paste-clipboard"
className="w-full min-h-[52px] mb-4 rounded-xl border-[1.5px] border-jewelInk font-sans text-[15px] font-extrabold text-jewelInk">
Вставить готовую из буфера
</button>

{saved && (
<div className="jewel-tile px-4 py-3 mb-4" data-testid="broadcast-draft">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -299,3 +299,28 @@ describe('AdminBroadcastScreen — готовая рассылка одним к
vi.useRealTimers()
})
})

describe('AdminBroadcastScreen — вставка из буфера одним нажатием', () => {
const READY = 'имя: myday-active\nкому: activeLately\nподарок: 7\nкнопка: Посмотреть первую серию\nадрес: moduleId=my-day&lessonId=1\n---\nНовый модуль — «Мой день»'

it('reads the clipboard on the first step and goes straight to sending', async () => {
vi.stubGlobal('navigator', { ...navigator, clipboard: { readText: vi.fn(async () => READY) } })
render(<AdminBroadcastScreen navigate={navigate} />)
await userEvent.click(screen.getByTestId('broadcast-paste-open'))
await waitFor(() => expect(title()).toBe('Отправка'))
expect(screen.getByTestId('broadcast-summary').textContent).toContain('Кому: занимались за последние 30 дней')
})

it('opens straight on sending with the text the list button read from the clipboard', async () => {
render(<AdminBroadcastScreen navigate={navigate} pasted={READY} />)
await waitFor(() => expect(title()).toBe('Отправка'))
expect(screen.getByTestId('broadcast-summary').textContent).toContain('Подарок: 7 дн. доступа')
})

it('shows the field with the reason when the clipboard holds something else', async () => {
render(<AdminBroadcastScreen navigate={navigate} pasted="просто текст" />)
expect(await screen.findByTestId('broadcast-paste-problem')).toBeTruthy()
expect((screen.getByLabelText('Готовая рассылка') as HTMLTextAreaElement).value).toBe('просто текст')
expect(title()).toBe('Текст')
})
})
2 changes: 1 addition & 1 deletion src/Trale/miniapp-src/src/types.ts
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ export type Screen =
/** Рассылки: список кампаний. */
| { kind: 'admin-broadcasts' }
/** Одна рассылка: без key — новая, по шагам; с key — её отправка и досылка. */
| { kind: 'admin-broadcast'; key?: string; draft?: boolean }
| { kind: 'admin-broadcast'; key?: string; draft?: boolean; paste?: string }
/** Вкладка «Ещё»: глаголы, оплаты, система. */
| { kind: 'admin-more' }
| { kind: 'admin-payments' }
Expand Down
Loading