From c5b300ffa2510ad584ce05b0b87991119c8e0038 Mon Sep 17 00:00:00 2001
From: root <root@forbion.f7cloud.ru>
Date: Thu, 14 May 2026 13:24:02 +0300
Subject: [PATCH] =?UTF-8?q?UI=20=D0=BE=D0=B1=D1=80=D0=B0=D1=89=D0=B5=D0=BD?=
 =?UTF-8?q?=D0=B8=D0=B9,=20WebSocket=20=D0=B8=20=D0=B8=D1=81=D0=BF=D1=80?=
 =?UTF-8?q?=D0=B0=D0=B2=D0=BB=D0=B5=D0=BD=D0=B8=D0=B5=20DnD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- Канбан: шире контейнер, колонки minmax(300px), больше высота списков и колонок, брейкпоинт 1100px.
- WebSocket: настраиваемый префикс support_ws_base (occ) и data-support-ws-base; корректная сборка пути /ws/tickets/…
- Устранён ReferenceError: clientChatDndBound до инициализации при открытии создания обращения.
---
 js/main.js                        | 40 ++++++++++++++++++++--------
 lib/Controller/PageController.php | 44 ++++++++++++++++++-------------
 templates/main.php                |  1 +
 3 files changed, 55 insertions(+), 30 deletions(-)

diff --git a/js/main.js b/js/main.js
index e68b0aa..8db71c9 100644
--- a/js/main.js
+++ b/js/main.js
@@ -5,6 +5,7 @@
   const username = root.dataset.username;
   const serverAddress = root.dataset.serverAddress;
   const apiBase = root.dataset.supportApiBase;
+  const supportWsBaseOverride = (root.dataset.supportWsBase || "").trim();
 
   const RASTER_IMAGE_EXT = new Set(["jpg", "jpeg", "png", "gif", "webp", "bmp", "tif", "tiff", "heic", "heif"]);
   const RASTER_IMAGE_MIME = new Set([
@@ -149,10 +150,25 @@
   }
 
   function wsUrlForTicket(ticketNumber) {
+    const tail = `/tickets/${encodeURIComponent(ticketNumber)}`;
+    if (supportWsBaseOverride) {
+      try {
+        const raw = supportWsBaseOverride.replace(/\/$/, "");
+        const u = new URL(raw.includes("://") ? raw : `wss://${raw}`);
+        const wsProto = u.protocol === "https:" ? "wss:" : u.protocol === "http:" ? "ws:" : u.protocol;
+        let path = (u.pathname || "").replace(/\/$/, "");
+        if (path === "" || path === "/") {
+          path = "/ws";
+        }
+        return `${wsProto}//${u.host}${path}${tail}`;
+      } catch (_) {
+        return null;
+      }
+    }
     try {
       const u = new URL(apiBase);
       const wsProto = u.protocol === "https:" ? "wss:" : "ws:";
-      return `${wsProto}//${u.host}/ws/tickets/${encodeURIComponent(ticketNumber)}`;
+      return `${wsProto}//${u.host}/ws${tail}`;
     } catch (_) {
       return null;
     }
@@ -311,25 +327,26 @@
       </div>
     </div>
     <style>
-      .f7support-wrap { padding: 16px; font-family: sans-serif; max-width: min(1200px, 100%); box-sizing: border-box; }
+      .f7support-wrap { padding: 16px; font-family: sans-serif; max-width: min(1680px, 100%); width: 100%; box-sizing: border-box; }
       .f7support-error { color: #b00020; min-height: 1.25em; margin: 8px 0; }
-      .f7support-main { margin-top: 12px; }
+      .f7support-main { margin-top: 12px; width: 100%; }
       .f7-board {
         display: grid;
-        grid-template-columns: repeat(3, minmax(0, 1fr));
-        gap: 12px;
+        grid-template-columns: repeat(3, minmax(300px, 1fr));
+        gap: 16px;
         margin-top: 12px;
         align-items: stretch;
+        width: 100%;
       }
-      @media (max-width: 900px) {
+      @media (max-width: 1100px) {
         .f7-board { grid-template-columns: 1fr; }
       }
       .f7-column {
         border: 1px solid #ddd;
         border-radius: 8px;
         background: #fafafa;
-        padding: 10px;
-        min-height: 200px;
+        padding: 12px;
+        min-height: min(52vh, 560px);
         display: flex;
         flex-direction: column;
       }
@@ -339,8 +356,8 @@
         margin: 0;
         padding: 0;
         flex: 1;
-        min-height: 160px;
-        max-height: min(56vh, 520px);
+        min-height: min(42vh, 420px);
+        max-height: min(72vh, 820px);
         overflow-y: auto;
       }
       .f7-ticket-card {
@@ -645,6 +662,8 @@
   const createModal = document.getElementById("create-ticket-modal");
   const chatModal = document.getElementById("chat-modal");
 
+  let clientChatDndBound = false;
+
   bindClientChatDnDOnce();
 
   function showError(message) {
@@ -682,7 +701,6 @@
     updatePendingFileUi();
   }
 
-  let clientChatDndBound = false;
   function bindClientChatDnDOnce() {
     if (clientChatDndBound) return;
     clientChatDndBound = true;
diff --git a/lib/Controller/PageController.php b/lib/Controller/PageController.php
index b3f585f..064228a 100644
--- a/lib/Controller/PageController.php
+++ b/lib/Controller/PageController.php
@@ -6,20 +6,22 @@ namespace OCA\F7Support\Controller;
 
 use OCP\AppFramework\Controller;
 use OCP\AppFramework\Http\TemplateResponse;
+use OCP\IConfig;
 use OCP\IRequest;
 use OCP\IURLGenerator;
 use OCP\IUserSession;
 use OCP\Util;
 
 class PageController extends Controller {
-    public function __construct(
-        string $AppName,
-        IRequest $request,
-        private IUserSession $userSession,
-        private IURLGenerator $urlGenerator
-    ) {
-        parent::__construct($AppName, $request);
-    }
+	public function __construct(
+		string $AppName,
+		IRequest $request,
+		private IUserSession $userSession,
+		private IURLGenerator $urlGenerator,
+		private IConfig $config,
+	) {
+		parent::__construct($AppName, $request);
+	}
 
     /**
      * @NoAdminRequired
@@ -30,19 +32,23 @@ class PageController extends Controller {
         $baseUrl = $this->urlGenerator->getBaseUrl();
         $serverHost = parse_url($baseUrl, PHP_URL_HOST) ?: 'localhost';
 
-        $supportApiBase = 'https://support.f7cloud.ru';
-        $supportParts = parse_url($supportApiBase);
-        $supportApiOrigin = ($supportParts['scheme'] ?? 'https') . '://' . ($supportParts['host'] ?? '');
+		$supportApiBase = 'https://support.f7cloud.ru';
+		$supportParts = parse_url($supportApiBase);
+		$supportApiOrigin = ($supportParts['scheme'] ?? 'https') . '://' . ($supportParts['host'] ?? '');
 
-        Util::addStyle('f7support', 'f7support');
-        Util::addScript('f7support', 'main');
+		// Optional full WebSocket URL prefix, e.g. wss://support.f7cloud.ru/api/ws (path before /tickets/{id})
+		$supportWsBase = $this->config->getAppValue('f7support', 'support_ws_base', '');
 
-        return new TemplateResponse('f7support', 'main', [
-            'username' => $user ? $user->getUID() : '',
-            'serverAddress' => $serverHost,
-            'supportApiBase' => $supportApiBase,
-            'supportApiOrigin' => $supportApiOrigin,
-        ]);
+		Util::addStyle('f7support', 'f7support');
+		Util::addScript('f7support', 'main');
+
+		return new TemplateResponse('f7support', 'main', [
+			'username' => $user ? $user->getUID() : '',
+			'serverAddress' => $serverHost,
+			'supportApiBase' => $supportApiBase,
+			'supportApiOrigin' => $supportApiOrigin,
+			'supportWsBase' => $supportWsBase,
+		]);
     }
 }
 
diff --git a/templates/main.php b/templates/main.php
index 9a6d09d..79a398c 100644
--- a/templates/main.php
+++ b/templates/main.php
@@ -4,5 +4,6 @@
      data-username="<?php p($_['username']); ?>"
      data-server-address="<?php p($_['serverAddress']); ?>"
      data-support-api-base="<?php p($_['supportApiBase']); ?>"
+     data-support-ws-base="<?php p($_['supportWsBase'] ?? ''); ?>"
      data-messages-poll-ms="5000">
 </div>