Дмитрий
6e2ad108de
После правки slepok-чувствительных полей проекта (regions / delivery_days_mask /
daily_limit_target / источник) backend возвращает ProjectResource.applies_from
= N.21:00 МСК (Task 2.11 backend slice, commit dd5954d8). Клиент Лидерры
теперь видит расширенный тост: «Сохранено. Изменения вступят в силу
DD.MM.YYYY в 21:00 МСК.» Когда правка не затронула slepok — обычное
«Сохранено.».
Изменения:
- composables/appliesFromMessage.ts — чистый форматтер (Moscow tz, не локаль клиента).
- ProjectDetailsDrawer / NewProjectDialog / EditProjectDialog — emit('saved', appliesFrom).
- ProjectsView — v-snackbar + onSaved/onDrawerSaved обработчики.
- tests/Frontend/appliesFromMessage.spec.ts — 5 invariant-кейсов.
Plan §Task 2.11 Step 5-6. Spec §4.2.5 UX block. R-15 + R-06..R-08 UX closure.
Vitest worktree-only 944/3sk GREEN, vue-tsc 3 pre-existing errors (вне диффа),
ESLint clean на затронутых файлах.
Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
402 lines
14 KiB
Vue
402 lines
14 KiB
Vue
<script setup lang="ts">
|
|
import { ref, reactive, computed, onMounted, onBeforeUnmount, watch } from 'vue';
|
|
import axios from 'axios';
|
|
import type { Project } from '../../stores/projectsStore';
|
|
import { useProjectsStore } from '../../stores/projectsStore';
|
|
import { REGIONS, FEDERAL_DISTRICT_NAMES } from '../../constants/regions';
|
|
import { repositionMenuAfterOpen } from '../../utils/menuRepositionFix';
|
|
|
|
const props = defineProps<{ project: Project | null }>();
|
|
const emit = defineEmits<{ close: []; saved: [appliesFrom: string | null] }>();
|
|
|
|
interface FormState {
|
|
name: string;
|
|
daily_limit_target: number;
|
|
regions: number[];
|
|
delivery_days_mask: number;
|
|
sms_senders: string[];
|
|
sms_keyword: string;
|
|
signal_identifier: string;
|
|
}
|
|
|
|
const form = reactive<FormState>({
|
|
name: '',
|
|
daily_limit_target: 50,
|
|
regions: [],
|
|
delivery_days_mask: 127,
|
|
sms_senders: [],
|
|
sms_keyword: '',
|
|
signal_identifier: '',
|
|
});
|
|
|
|
const selectableRegions = REGIONS.filter((r) => r.code !== 0);
|
|
|
|
function reseedFromProject(p: Project | null): void {
|
|
if (!p) return;
|
|
form.name = p.name;
|
|
form.daily_limit_target = p.daily_limit_target;
|
|
form.regions = Array.isArray(p.regions) ? [...p.regions] : [];
|
|
form.delivery_days_mask = p.delivery_days_mask ?? 127;
|
|
form.sms_senders = p.sms_senders ?? [];
|
|
form.sms_keyword = p.sms_keyword ?? '';
|
|
form.signal_identifier = p.signal_identifier ?? '';
|
|
}
|
|
reseedFromProject(props.project);
|
|
|
|
watch(
|
|
() => props.project?.id,
|
|
() => {
|
|
reseedFromProject(props.project);
|
|
},
|
|
);
|
|
|
|
const saving = ref(false);
|
|
const errors = reactive<Record<string, string[]>>({});
|
|
|
|
const store = useProjectsStore();
|
|
|
|
async function onPause(): Promise<void> {
|
|
if (!props.project) return;
|
|
await store.toggleActive(props.project);
|
|
// #4: после паузы/возобновления панель и галочка должны исчезнуть (как у Save и Delete).
|
|
emit('close');
|
|
}
|
|
|
|
async function onDelete(): Promise<void> {
|
|
if (!props.project) return;
|
|
const ok = window.confirm(
|
|
'Удалить проект? Действие необратимо. Если по проекту есть сделки или поставщик уже заказал лиды — удаление будет заблокировано.',
|
|
);
|
|
if (!ok) return;
|
|
Object.keys(errors).forEach((k) => delete errors[k]);
|
|
try {
|
|
await store.del(props.project.id);
|
|
emit('close');
|
|
} catch (e: unknown) {
|
|
const err = e as { response?: { status?: number; data?: { errors?: Record<string, string[]> } } };
|
|
if (err.response?.status === 422 && err.response.data?.errors) {
|
|
Object.assign(errors, err.response.data.errors);
|
|
}
|
|
// НЕ закрываем drawer — клиент видит ошибку и может поставить проект на паузу.
|
|
}
|
|
}
|
|
|
|
async function onSave(): Promise<void> {
|
|
if (!props.project) return;
|
|
saving.value = true;
|
|
Object.keys(errors).forEach((k) => delete errors[k]);
|
|
try {
|
|
const payload: Record<string, unknown> = {
|
|
name: form.name,
|
|
daily_limit_target: form.daily_limit_target,
|
|
regions: form.regions,
|
|
delivery_days_mask: form.delivery_days_mask,
|
|
};
|
|
// 18.05.2026 ux: редактирование источника проекта.
|
|
if (props.project.signal_type === 'site' || props.project.signal_type === 'call') {
|
|
payload.signal_identifier = form.signal_identifier;
|
|
}
|
|
if (props.project.signal_type === 'sms') {
|
|
payload.sms_senders = form.sms_senders;
|
|
payload.sms_keyword = form.sms_keyword;
|
|
}
|
|
const { data } = await axios.patch(`/api/projects/${props.project.id}`, payload);
|
|
// Backend кладёт applies_from когда правка задела slepok-чувствительные поля
|
|
// (см. ProjectService::updateAndExposeAppliesFrom / Task 2.8).
|
|
const appliesFrom: string | null = data?.data?.applies_from ?? null;
|
|
emit('saved', appliesFrom);
|
|
} catch (e: unknown) {
|
|
const err = e as { response?: { status?: number; data?: { errors?: Record<string, string[]> } } };
|
|
if (err.response?.status === 422 && err.response.data?.errors) {
|
|
Object.assign(errors, err.response.data.errors);
|
|
}
|
|
} finally {
|
|
saving.value = false;
|
|
}
|
|
}
|
|
|
|
function onKey(e: KeyboardEvent): void {
|
|
if (e.key === 'Escape' && props.project) emit('close');
|
|
}
|
|
onMounted(() => document.addEventListener('keydown', onKey));
|
|
onBeforeUnmount(() => document.removeEventListener('keydown', onKey));
|
|
|
|
const activeDays = computed<boolean[]>(() => {
|
|
const mask = form.delivery_days_mask;
|
|
return Array.from({ length: 7 }, (_, i) => (mask & (1 << i)) !== 0);
|
|
});
|
|
|
|
function toggleDay(i: number): void {
|
|
form.delivery_days_mask ^= 1 << i;
|
|
}
|
|
|
|
const dayLabels = ['Пн', 'Вт', 'Ср', 'Чт', 'Пт', 'Сб', 'Вс'];
|
|
</script>
|
|
|
|
<template>
|
|
<aside class="project-details-drawer" :class="{ open: project !== null }">
|
|
<div v-if="project" class="pdd-content">
|
|
<header class="pdd-head">
|
|
<div class="pdd-title">{{ project.name }}</div>
|
|
<button class="pdd-close" data-testid="pdd-close" @click="$emit('close')">✕</button>
|
|
</header>
|
|
|
|
<div class="pdd-body">
|
|
<!-- Общая ошибка уровня проекта (например, supplier-snapshot guard или has-deals на delete). -->
|
|
<div v-if="errors.project" class="pdd-error pdd-error-banner" data-testid="pdd-error-project">
|
|
{{ errors.project[0] }}
|
|
</div>
|
|
|
|
<label class="pdd-field">
|
|
<span class="pdd-label">Название</span>
|
|
<input v-model="form.name" data-testid="pdd-name" class="pdd-input" />
|
|
<div v-if="errors.name" class="pdd-error" data-testid="pdd-error-name">{{ errors.name[0] }}</div>
|
|
</label>
|
|
|
|
<!-- 18.05.2026 ux: редактирование источника проекта (site/call/sms) -->
|
|
<label v-if="project?.signal_type === 'site'" class="pdd-field">
|
|
<span class="pdd-label">Источник — домен сайта-донора</span>
|
|
<input
|
|
v-model="form.signal_identifier"
|
|
data-testid="pdd-signal-identifier"
|
|
class="pdd-input"
|
|
placeholder="okna-konkurent.ru"
|
|
/>
|
|
<div v-if="errors.signal_identifier" class="pdd-error" data-testid="pdd-error-signal">
|
|
{{ errors.signal_identifier[0] }}
|
|
</div>
|
|
</label>
|
|
<label v-else-if="project?.signal_type === 'call'" class="pdd-field">
|
|
<span class="pdd-label">Источник — телефонный номер донора</span>
|
|
<input
|
|
v-model="form.signal_identifier"
|
|
data-testid="pdd-signal-identifier"
|
|
class="pdd-input"
|
|
placeholder="79161234567"
|
|
/>
|
|
<div v-if="errors.signal_identifier" class="pdd-error" data-testid="pdd-error-signal">
|
|
{{ errors.signal_identifier[0] }}
|
|
</div>
|
|
</label>
|
|
<div v-else-if="project?.signal_type === 'sms'" class="pdd-field">
|
|
<span class="pdd-label">Источник — отправители SMS</span>
|
|
<v-combobox
|
|
v-model="form.sms_senders"
|
|
data-testid="pdd-sms-senders"
|
|
multiple
|
|
chips
|
|
clearable
|
|
density="comfortable"
|
|
hide-details
|
|
placeholder="MTS, BEELINE …"
|
|
/>
|
|
<div v-if="errors.sms_senders" class="pdd-error">{{ errors.sms_senders[0] }}</div>
|
|
<span class="pdd-label mt-2">Ключевое слово (опционально)</span>
|
|
<input
|
|
v-model="form.sms_keyword"
|
|
data-testid="pdd-sms-keyword"
|
|
class="pdd-input"
|
|
placeholder="КРЕДИТ"
|
|
/>
|
|
<div v-if="errors.sms_keyword" class="pdd-error">{{ errors.sms_keyword[0] }}</div>
|
|
</div>
|
|
|
|
<label class="pdd-field">
|
|
<span class="pdd-label">Лимит лидов в день</span>
|
|
<input
|
|
v-model.number="form.daily_limit_target"
|
|
type="number"
|
|
min="1"
|
|
max="10000"
|
|
data-testid="pdd-limit"
|
|
class="pdd-input"
|
|
/>
|
|
<div v-if="errors.daily_limit_target" class="pdd-error">{{ errors.daily_limit_target[0] }}</div>
|
|
</label>
|
|
|
|
<div class="pdd-field">
|
|
<span class="pdd-label">Регионы (пусто = вся РФ)</span>
|
|
<v-autocomplete
|
|
v-model="form.regions"
|
|
:items="selectableRegions"
|
|
item-title="name"
|
|
item-value="code"
|
|
multiple
|
|
chips
|
|
closable-chips
|
|
clearable
|
|
density="comfortable"
|
|
hide-details
|
|
data-testid="pdd-regions"
|
|
@update:menu="repositionMenuAfterOpen"
|
|
>
|
|
<template #item="{ props: itemProps, item }">
|
|
<v-list-item v-bind="itemProps">
|
|
<template #subtitle>
|
|
{{ FEDERAL_DISTRICT_NAMES[item.raw.federalDistrict] || '' }}
|
|
</template>
|
|
</v-list-item>
|
|
</template>
|
|
</v-autocomplete>
|
|
</div>
|
|
|
|
<div class="pdd-field">
|
|
<span class="pdd-label">Дни недели приёма</span>
|
|
<div class="pdd-days">
|
|
<button
|
|
v-for="(label, i) in dayLabels"
|
|
:key="i"
|
|
type="button"
|
|
:data-testid="`pdd-day-${i}`"
|
|
:class="['pdd-day', { active: activeDays[i] }]"
|
|
@click="toggleDay(i)"
|
|
>
|
|
{{ label }}
|
|
</button>
|
|
</div>
|
|
</div>
|
|
</div>
|
|
|
|
<footer class="pdd-foot">
|
|
<div class="pdd-foot-left">
|
|
<button class="pdd-btn pdd-btn-warning" data-testid="pdd-pause" @click="onPause">
|
|
{{ project.is_active ? '⏸ Приостановить' : '▶ Возобновить' }}
|
|
</button>
|
|
<button class="pdd-btn pdd-btn-error" data-testid="pdd-delete" @click="onDelete">🗄 Удалить</button>
|
|
</div>
|
|
<div class="pdd-foot-right">
|
|
<button class="pdd-btn pdd-btn-text" data-testid="pdd-cancel" @click="$emit('close')">
|
|
Отмена
|
|
</button>
|
|
<button class="pdd-btn pdd-btn-primary" data-testid="pdd-save" :disabled="saving" @click="onSave">
|
|
Сохранить
|
|
</button>
|
|
</div>
|
|
</footer>
|
|
</div>
|
|
</aside>
|
|
</template>
|
|
|
|
<style scoped>
|
|
.project-details-drawer {
|
|
position: fixed;
|
|
top: 0;
|
|
right: 0;
|
|
bottom: 0;
|
|
width: 480px;
|
|
background: var(--liderra-surface, #ffffff);
|
|
border-left: 1px solid var(--liderra-line, #e6e2d6);
|
|
box-shadow: -4px 0 16px rgba(0, 0, 0, 0.06);
|
|
transform: translateX(100%);
|
|
transition: transform 240ms cubic-bezier(0.16, 1, 0.3, 1);
|
|
display: flex;
|
|
flex-direction: column;
|
|
z-index: 5;
|
|
}
|
|
.project-details-drawer.open {
|
|
transform: translateX(0);
|
|
}
|
|
.pdd-content {
|
|
display: flex;
|
|
flex-direction: column;
|
|
height: 100%;
|
|
}
|
|
.pdd-head {
|
|
display: flex;
|
|
justify-content: space-between;
|
|
align-items: center;
|
|
padding: 16px 20px;
|
|
border-bottom: 1px solid var(--liderra-line, #e6e2d6);
|
|
}
|
|
.pdd-title {
|
|
font-weight: 600;
|
|
font-size: 16px;
|
|
}
|
|
.pdd-close {
|
|
background: none;
|
|
border: 0;
|
|
cursor: pointer;
|
|
font-size: 18px;
|
|
padding: 4px;
|
|
}
|
|
.pdd-body {
|
|
padding: 16px 20px;
|
|
display: flex;
|
|
flex-direction: column;
|
|
gap: 14px;
|
|
flex: 1;
|
|
overflow-y: auto;
|
|
}
|
|
.pdd-field {
|
|
display: flex;
|
|
flex-direction: column;
|
|
gap: 4px;
|
|
}
|
|
.pdd-label {
|
|
font-size: 12px;
|
|
color: #6b6f72;
|
|
}
|
|
.pdd-input {
|
|
padding: 8px 10px;
|
|
border: 1px solid var(--liderra-line, #e6e2d6);
|
|
border-radius: 6px;
|
|
font: inherit;
|
|
}
|
|
.pdd-days {
|
|
display: flex;
|
|
gap: 4px;
|
|
}
|
|
.pdd-day {
|
|
padding: 6px 10px;
|
|
border: 1px solid var(--liderra-line, #e6e2d6);
|
|
background: #ffffff;
|
|
border-radius: 4px;
|
|
cursor: pointer;
|
|
font: inherit;
|
|
}
|
|
.pdd-day.active {
|
|
background: #0f6e56;
|
|
color: #ffffff;
|
|
border-color: #0f6e56;
|
|
}
|
|
.pdd-foot {
|
|
display: flex;
|
|
justify-content: space-between;
|
|
padding: 12px 20px;
|
|
border-top: 1px solid var(--liderra-line, #e6e2d6);
|
|
}
|
|
.pdd-foot-left,
|
|
.pdd-foot-right {
|
|
display: flex;
|
|
gap: 8px;
|
|
}
|
|
.pdd-btn {
|
|
padding: 6px 14px;
|
|
border: 0;
|
|
border-radius: 6px;
|
|
cursor: pointer;
|
|
font: inherit;
|
|
}
|
|
.pdd-btn-text {
|
|
background: transparent;
|
|
color: #081319;
|
|
}
|
|
.pdd-btn-primary {
|
|
background: #0f6e56;
|
|
color: #ffffff;
|
|
}
|
|
.pdd-btn-warning {
|
|
background: #f59e0b;
|
|
color: #ffffff;
|
|
}
|
|
.pdd-btn-error {
|
|
background: #dc2626;
|
|
color: #ffffff;
|
|
}
|
|
.pdd-error {
|
|
color: #dc2626;
|
|
font-size: 12px;
|
|
margin-top: 4px;
|
|
}
|
|
</style>
|