diff --git a/Desktop App/render/ceo/js/overview_departments.js b/Desktop App/render/ceo/js/overview_departments.js index a673915..58a83b9 100644 --- a/Desktop App/render/ceo/js/overview_departments.js +++ b/Desktop App/render/ceo/js/overview_departments.js @@ -10,11 +10,6 @@ document.addEventListener('DOMContentLoaded', async () => { const closeCreateModalButton = document.getElementById('closeCreateModal'); const confirmCreateButton = document.getElementById('confirmCreateButton'); - if (!await window.networkAPI.openUcSocket()) { - await window.uiAPI.showAlert('Internal error of the application. Unable to open socket.'); - return; - } - backButton.addEventListener('click', async () => { await window.networkAPI.closeUcSocket(); fadeOut('main_menu'); @@ -48,6 +43,11 @@ async function fetchDepartments() { const departmentsContainer = document.getElementById('departments-container'); departmentsContainer.innerHTML = ''; // Clear any existing data + if (!await window.networkAPI.openUcSocket()) { + await window.uiAPI.showAlert('Internal error of the application. Unable to open socket.'); + return; + } + // Retrieve the operation codes via IPC const operationCodes = await window.networkAPI.getOperationsCodes(); if (!operationCodes) { diff --git a/Desktop App/src/helpers/window_manager.ts b/Desktop App/src/helpers/window_manager.ts index 416548b..555fa85 100644 --- a/Desktop App/src/helpers/window_manager.ts +++ b/Desktop App/src/helpers/window_manager.ts @@ -122,12 +122,13 @@ export class WindowManager { title: 'Announcement', webPreferences: { preload: path.join(__dirname, '..', 'main', 'preload.js'), - contextIsolation: true, nodeIntegration: false, + contextIsolation: true, + sandbox: false, }, }) - this.announcementWindow.removeMenu() + //this.announcementWindow.removeMenu() const announcementPath = path.join(this.pathToPagesDir, 'announcement.html') await this.announcementWindow.loadFile(announcementPath) diff --git a/Desktop App/src/main/main.ts b/Desktop App/src/main/main.ts index 075245e..101afa1 100644 --- a/Desktop App/src/main/main.ts +++ b/Desktop App/src/main/main.ts @@ -201,7 +201,11 @@ function registerIPCHandlers() { if (!db) throw new Error('Database is not initialized.') const data = await db.read() const announcement = data.network.announcement - data.network.announcement = '' + + await db.update((data) => { + data.network.announcement = '' + return data + }) return announcement })