@@ -167,20 +148,19 @@ const isAuthenticated = ref(props.is_authenticated);
const currentVersion = ref(props.current_version);
const checkingVersion = ref(false);
const checkingAccess = ref(false);
-const updating = ref(false);
-const progress = ref(0);
+const updating = ref(null);
+const updatePhase = ref('');
const updateError = ref(null);
const versionInfo = ref({ current_version: props.current_version, has_update: false, latest_version: null });
const accessInfo = ref({ has_access: false, error: null });
const selectedParts = ref({});
if (props.parts) {
for (const [id, moduleData] of Object.entries(props.parts)) {
- if (!moduleData.disabled) {
- selectedParts.value[id] = [];
+ if (!moduleData.disabled && moduleData.parts) {
+ selectedParts.value[id] = moduleData.parts.filter(p => p.access).map(p => p.id);
}
}
}
-const updatingPart = ref(null);
const partStatus = ref({});
const partErrors = ref({});
@@ -246,35 +226,59 @@ async function checkVersion() {
}
async function updateModule(moduleId) {
- if (!confirm('Обновить модуль?')) return;
+ const partsToUpdate = selectedParts.value[moduleId] || [];
+ const msg = partsToUpdate.length
+ ? `Обновить модуль и ${partsToUpdate.length} раздел(ов)?`
+ : 'Обновить модуль (только ядро и файлы)?';
+ if (!confirm(msg)) return;
- updating.value = true;
- progress.value = 0;
+ updating.value = moduleId;
+ updatePhase.value = 'Обновление ядра модуля...';
updateError.value = null;
-
- const timer = setInterval(() => {
- if (progress.value < 90) progress.value += 10;
- }, 500);
+ // Clear previous part statuses
+ for (const p of partsToUpdate) {
+ delete partStatus.value[`${moduleId}-${p}`];
+ delete partErrors.value[`${moduleId}-${p}`];
+ }
try {
+ // Phase 1: Core + FM sync
const res = await axios.post(route('dashboard.vikon-updates.update-module'), { module_id: moduleId });
- progress.value = 100;
- clearInterval(timer);
-
- if (res.data.success) {
- updateError.value = null;
- updating.value = false;
- alert(res.data.message);
- } else {
+ if (!res.data.success) {
updateError.value = res.data.message;
- updating.value = false;
+ updating.value = null;
+ return;
}
+
+ // Phase 2: Update selected parts
+ if (partsToUpdate.length) {
+ updatePhase.value = 'Обновление разделов...';
+ for (const part of partsToUpdate) {
+ const key = `${moduleId}-${part}`;
+ partStatus.value[key] = 'loading';
+
+ try {
+ await axios.post(route('dashboard.vikon-updates.update-part'), {
+ module_id: moduleId,
+ part,
+ });
+ partStatus.value[key] = 'success';
+ } catch (e) {
+ partStatus.value[key] = 'error';
+ partErrors.value[key] = e.response?.data?.message || e.message;
+ }
+ }
+ }
+
+ updateError.value = null;
+ alert('Модуль обновлён.');
} catch (e) {
- clearInterval(timer);
- updating.value = false;
const msg = e.response?.data?.message || e.message || 'Неизвестная ошибка';
const code = e.response?.status || '';
updateError.value = code ? `[${code}] ${msg}` : msg;
+ } finally {
+ updating.value = null;
+ updatePhase.value = '';
}
}
@@ -293,37 +297,6 @@ function toggleAllParts(moduleId) {
}
}
-async function updateSelectedParts(moduleId) {
- const partsToUpdate = selectedParts.value[moduleId] || [];
- if (!partsToUpdate.length) return;
-
- updatingPart.value = moduleId;
- // Clear previous statuses for this module
- for (const part of partsToUpdate) {
- delete partStatus.value[`${moduleId}-${part}`];
- delete partErrors.value[`${moduleId}-${part}`];
- }
-
- for (const part of partsToUpdate) {
- const key = `${moduleId}-${part}`;
- partStatus.value[key] = 'loading';
- partErrors.value[key] = null;
-
- try {
- await axios.post(route('dashboard.vikon-updates.update-part'), {
- module_id: moduleId,
- part,
- });
- partStatus.value[key] = 'success';
- } catch (e) {
- partStatus.value[key] = 'error';
- partErrors.value[key] = e.response?.data?.message || e.message;
- }
- }
-
- updatingPart.value = null;
-}
-
async function logout() {
try {
await axios.post(route('dashboard.vikon-updates.logout'));