issues/27: cabinet owl.carousel Stimulus fix

.gitignore

@@ -1,4 +1,5 @@
 ###> symfony/framework-bundle ###
+/.env
 /.env.local
 /.env.local.php
 /.env.*.local
@@ -24,6 +25,6 @@ yarn-error.log
 ###< symfony/webpack-encore-bundle ###
 /*.md
 /*.lock
+!/yarn.lock
 /symfony.lock
-/yarn.lock
 /service.sh

Dockerfile

@@ -1,5 +1,14 @@
 # syntax=docker/dockerfile:1
 
+FROM node:24-alpine AS assets
+WORKDIR /app
+COPY package.json yarn.lock* ./
+RUN corepack enable && if [ -f yarn.lock ]; then yarn install --frozen-lockfile; else yarn install; fi
+COPY webpack.config.js ./
+COPY assets ./assets
+COPY public ./public
+RUN yarn build
+
 FROM composer:2 AS vendor
 WORKDIR /app
 COPY composer.json composer.lock* ./
@@ -29,6 +38,7 @@ RUN cp /usr/share/zoneinfo/$TZ /etc/localtime && echo "$TZ" > /etc/timezone
 
 COPY docker/fpm-pool.conf /usr/local/etc/php-fpm.d/zz-docker.conf
 COPY --from=vendor /app /app
+COPY --from=assets /app/public/build /app/public/build
 
 RUN mkdir -p var/cache var/log public/uploads public/banners \
     && chown -R www-data:www-data var public/uploads public/banners \

assets/components/helper.js

@@ -207,7 +207,15 @@ function countDown(options) {
     };
 }
 
+function isTestContour() {
+    return /\.sova\.local$/i.test(location.hostname);
+}
+
 function getApiHostname() {
+    if (isTestContour()) {
+        return 'http://api.test.sova.local';
+    }
+
     if (/sovamed\.ru/m.test(location.hostname)) {
         return 'https://api.sovamed.ru';
     }
@@ -216,6 +224,10 @@ function getApiHostname() {
 }
 
 function getHostname() {   
+    if (isTestContour()) {
+        return location.origin;
+    }
+
     if (/sovamed\.ru/m.test(location.hostname)) {
         return 'https://cabinet.sovamed.ru';
     }

assets/components/loader.js

@@ -1,4 +1,5 @@
 const helper = require("./helper.js");
+const testSdk = require("./testSdk.js");
 
 function esia() {
   if (document.location.search == '?esia=true') {
@@ -39,6 +40,14 @@ function esia() {
 
 function loadSDK(controller) {
   return new Promise(function(resolve, reject) {
+    if (testSdk.install()) {
+      console.log(controller + ' - test sdk (sova.local)');
+      window.webSDK = new WrSDK();
+      esia();
+      resolve(window.webSDK);
+      return;
+    }
+
     var script = document.getElementById('sdk-infoclinica');
 
     if (script == null) {

assets/components/record.js

@@ -1,6 +1,7 @@
 const loader = require("./loader.js");
 const validator = require("./validator.js");
 const helper = require("./helper.js");
+const onlineModeUtil = require("./onlineMode.js");
 const Cookies = require('js-cookie');
 
 function renderFormRecord(userInfo, params) {
@@ -21,9 +22,9 @@ function renderFormRecord(userInfo, params) {
     popup.dataset.company = company;
     popup.dataset.comment = comment;
     popup.dataset.rnum = params.rnum;
-    popup.querySelector('.modal-title').innerHTML = (params.onlinemode === 'false')
-        ? 'Записаться к врачу'
-        : 'Запись на онлайн-консультацию'
+    popup.querySelector('.modal-title').innerHTML = onlineModeUtil.isOnlineMode(params.onlinemode)
+        ? 'Запись на онлайн-консультацию'
+        : 'Записаться к врачу'
     ;
 
     popup.querySelector('.modal-dialog').classList.remove('modal-lg');
@@ -35,7 +36,7 @@ function renderFormRecord(userInfo, params) {
 
     var licenseLink = helper.getLicenseLink(Cookies.get('region'));
     
-    if (params.onlinemode === 'false') {
+    if (!onlineModeUtil.isOnlineMode(params.onlinemode)) {
         var license = document.createElement('a');
         license.classList = "staff-info__review license-link";
         license.href = licenseLink;
@@ -881,11 +882,7 @@ function validateData(data) {
 }
 
 function sendReserve(el) {
-    if (el.dataset.onlinemode === 'true') {
-        var onlineMode = 1;
-    } else {
-        var onlineMode = 0;
-    }
+    var onlineMode = onlineModeUtil.toOnlineType(el.dataset.onlinemode);
 
     var workDate = new Date(el.dataset.workDate);
     var time = el.dataset.time.split('-');

assets/components/testSdk.js

@@ -0,0 +1,115 @@
+/**
+ * Test-contour shim for the MIS webSDK (WrSDK) and Yandex SmartCaptcha.
+ *
+ * Production keeps loading the real SDK from widget.sovamed.ru / widget.wmtmed.ru
+ * and the real captcha from smartcaptcha.yandexcloud.net. Those hosts are not
+ * reachable from the isolated *.sova.local test contour and their captcha sitekey
+ * is bound to production domains, so patient registration cannot complete there.
+ *
+ * This module is a no-op unless the page is served from a *.sova.local host.
+ */
+
+function isTestContour() {
+    return typeof location !== 'undefined' && /\.sova\.local$/i.test(location.hostname);
+}
+
+function resolveLater(value, ms) {
+    return new Promise(function(resolve) {
+        setTimeout(function() { resolve(value); }, ms || 150);
+    });
+}
+
+function rejectLater(value, ms) {
+    return new Promise(function(_, reject) {
+        setTimeout(function() { reject(value); }, ms || 150);
+    });
+}
+
+function TestWrSDK() {
+    this.data = { user: { authenticated: false } };
+    this.sdkOrigin = location.origin;
+}
+
+TestWrSDK.prototype.on = function(event, callback) {
+    if (typeof callback === 'function') {
+        setTimeout(callback, 0);
+    }
+    return this;
+};
+
+TestWrSDK.prototype.isLoggedIn = function() {
+    return resolveLater({ authenticated: false });
+};
+
+// New patient: report "not found" so the UI switches to the registration form.
+TestWrSDK.prototype.recoveryInit = function() {
+    return rejectLater({ data: { message: 'Пользователь не найден в базе данных (тестовый контур)' } });
+};
+
+TestWrSDK.prototype.registerInit = function() {
+    return resolveLater({ data: { rToken: 'test-rtoken-' + Date.now(), email: 'false' } });
+};
+
+TestWrSDK.prototype.registerComplete = function() {
+    return resolveLater({ data: { text: 'Тестовый контур: аккаунт создан. Код подтверждения — любой.' } });
+};
+
+TestWrSDK.prototype.recoveryComplete = function() {
+    return resolveLater({ data: { message: 'Тестовый контур: пароль установлен.' } });
+};
+
+TestWrSDK.prototype.changeTempPassword = function() {
+    return resolveLater({ data: { success: 'Тестовый контур: пароль изменён.' } });
+};
+
+TestWrSDK.prototype.loadLoginView = function() {};
+
+TestWrSDK.prototype.loginClient = function() {
+    return rejectLater({ data: { message: 'Вход в тестовом контуре недоступен: МИС замокана.' } });
+};
+
+function installSmartCaptcha() {
+    if (window.smartCaptcha && window.smartCaptcha.__test) {
+        return;
+    }
+
+    window.smartCaptcha = {
+        __test: true,
+        render: function(container) {
+            if (container) {
+                container.innerHTML =
+                    '<div class="alert alert-info py-1 mb-0" style="font-size:12px">' +
+                    'Тестовый контур: проверка капчи отключена</div>';
+            }
+            return 'test-captcha-widget';
+        },
+        getResponse: function() { return 'test-captcha-token'; },
+        subscribe: function(widgetId, event, callback) {
+            if (event === 'success' && typeof callback === 'function') {
+                setTimeout(callback, 0);
+            }
+        },
+        reset: function() {},
+        execute: function() {}
+    };
+}
+
+function install() {
+    if (!isTestContour()) {
+        return false;
+    }
+
+    window.WrSDK = TestWrSDK;
+    installSmartCaptcha();
+
+    return true;
+}
+
+if (isTestContour()) {
+    installSmartCaptcha();
+}
+
+module.exports = {
+    isTestContour: isTestContour,
+    install: install
+};

assets/controllers/slideshow_controller.js

@@ -1,16 +1,13 @@
 import { Controller } from 'stimulus';
 import 'owl.carousel2/dist/assets/owl.carousel.css';
 import 'owl.carousel2/dist/assets/owl.theme.default.css';
-import 'owl.carousel2';
 
 /*
- * This is an example Stimulus controller!
- *
- * Any element with a data-controller="hello" attribute will cause
- * this controller to be executed. The name "hello" comes from the filename:
- * hello_controller.js -> "hello"
- *
- * Delete this file or adapt it for your use!
+ * owl.carousel2 is a legacy jQuery plugin that reads `window.jQuery` at module
+ * evaluation time. When statically imported it lands in the eager shared chunk,
+ * and depending on webpack chunk ordering it can evaluate before jQuery is ready,
+ * throwing and breaking the whole Stimulus bootstrap. Load it lazily inside
+ * connect() so it can never break unrelated controllers (e.g. registration).
  */
 export default class extends Controller {
     static targets = ["showid"];
@@ -18,31 +15,36 @@ export default class extends Controller {
     connect() {
         var slideshow = this.element;
 
-        $(slideshow).owlCarousel({
-            nav: true,
-            margin: 15,
-            autoplay: false,
-            autoplayTimeout: 7000,
-            autoplayHoverPause: true,
-            navText : ['<span class="swiper-button-prev">&nbsp;</span>','<span class="swiper-button-next">&nbsp;</span>'],
-                responsive: {
-                0: {
-                    items: 1,
-                    dots: false,
-                },
-                600: {
-                    items: 2,
-                    dots: false,
-                },
-                1000: {
-                    items: 2,
-                    dots: false,
+        import('owl.carousel2').then(function() {
+            $(slideshow).owlCarousel({
+                nav: true,
+                margin: 15,
+                autoplay: false,
+                autoplayTimeout: 7000,
+                autoplayHoverPause: true,
+                navText : ['<span class="swiper-button-prev">&nbsp;</span>','<span class="swiper-button-next">&nbsp;</span>'],
+                    responsive: {
+                    0: {
+                        items: 1,
+                        dots: false,
+                    },
+                    600: {
+                        items: 2,
+                        dots: false,
+                    },
+                    1000: {
+                        items: 2,
+                        dots: false,
+                    }
                 }
-            }
+            });
+
+            slideshow.classList.remove('hide');
+        }).catch(function(e) {
+            console.warn('owl.carousel failed to load', e);
+            slideshow.classList.remove('hide');
         });
 
-        slideshow.classList.remove('hide');
-    
         slideshow.querySelectorAll('.show-msg').forEach(function (el) {
             el.addEventListener('click', function (evn) {
                 var showId = evn.target.dataset.showId;

package.json

@@ -21,6 +21,7 @@
     },
     "license": "UNLICENSED",
     "private": true,
+    "packageManager": "yarn@1.22.22",
     "scripts": {
         "dev-server": "encore dev-server",
         "dev": "encore dev",

src/Controller/PublicAPIController.php

@@ -3,6 +3,7 @@
 namespace App\Controller;
 
 use App\Bundle\Infoclinica\Region;
+use App\Support\OnlineMode;
 use App\Entity\Record;
 use App\Entity\PriceDepartment;
 use App\Entity\PriceList;
@@ -226,7 +227,7 @@ class PublicAPIController extends AbstractController
         $doctor = $request->query->get('doctor');
         $department = $request->query->get('department');
         $filial = $request->query->get('filial');
-        $onlineMode = $request->query->get('onlineMode')? true: false;
+        $onlineMode = OnlineMode::isOnline($request->query->get('onlineMode'));
         $isFree = true;
         $nearestDate = NULL;
 

src/Controller/SpecialistController.php

@@ -119,7 +119,7 @@ SpecialistService $specialistService,
         $kinder = ($kinder == 1) ? 1 : null;
         
         $searchForm = $this->createForm(SpecialistSearchType::class, new SpecialistView(), [
-            'action' => $this->generateUrl('specialist_index'),
+            'action' => $this->generateUrl('specialist_online_index'),
             'method' => 'GET',
             'regionId' => $regionId,
             'kinder' => $kinder,
@@ -128,6 +128,7 @@ SpecialistService $specialistService,
         $searchForm->handleRequest($request);
 
         $filters = $request->query->get('specialist_search', ['onlineMode' => 1]);
+        $filters['onlineMode'] = 1;
         
         if ($regionId > 0) {
             $filters['regionId'] = $regionId;

src/Repository/SpecialistViewRepository.php

@@ -3,6 +3,7 @@
 namespace App\Repository;
 
 use App\Entity\SpecialistView;
+use App\Support\OnlineMode;
 use Doctrine\Bundle\DoctrineBundle\Repository\ServiceEntityRepository;
 use Doctrine\Persistence\ManagerRegistry;
 use Doctrine\ORM\QueryBuilder;
@@ -28,12 +29,20 @@ class SpecialistViewRepository extends ServiceEntityRepository
     private function applyFilters(QueryBuilder $qb, array $filters): void
     {
         foreach ($filters as $key => $value) {
+            // onlineMode=0 — валидный фильтр; empty(0) в PHP === true, поэтому обрабатываем отдельно.
+            if ($key === 'onlineMode') {
+                if ($value === null || $value === '') {
+                    continue;
+                }
+                $this->applyOnlineModeFilter($qb, OnlineMode::isOnline($value));
+                continue;
+            }
+
             if (empty($value)) {
                 continue;
             }
 
             match ($key) {
-                'onlineMode' => $this->applyOnlineModeFilter($qb, $value),
                 'regionId' => $this->applyRegionFilter($qb, $value),
                 'alias' => $this->applyAliasFilter($qb, $value),
                 'filial' => $this->applyFilialFilter($qb, $value),

src/Twig/AppExtension.php

@@ -180,8 +180,12 @@ class AppExtension extends AbstractExtension
     }
 
     public function isMobile() {
-        $useragent = $_SERVER['HTTP_USER_AGENT'];
-        
+        $useragent = $_SERVER['HTTP_USER_AGENT'] ?? '';
+
+        if ($useragent === '') {
+            return false;
+        }
+
         return preg_match('/(android|bb\d+|meego).+mobile|avantgo|bada\/|blackberry|blazer|compal|elaine|fennec|hiptop|iemobile|ip(hone|od)|iris|kindle|lge |maemo|midp|mmp|netfront|opera m(ob|in)i|palm( os)?|phone|p(ixi|re)\/|plucker|pocket|psp|series(4|6)0|symbian|treo|up\.(browser|link)|vodafone|wap|windows (ce|phone)|xda|xiino/i',$useragent)
             || preg_match('/1207|6310|6590|3gso|4thp|50[1-6]i|770s|802s|a wa|abac|ac(er|oo|s\-)|ai(ko|rn)|al(av|ca|co)|amoi|an(ex|ny|yw)|aptu|ar(ch|go)|as(te|us)|attw|au(di|\-m|r |s )|avan|be(ck|ll|nq)|bi(lb|rd)|bl(ac|az)|br(e|v)w|bumb|bw\-(n|u)|c55\/|capi|ccwa|cdm\-|cell|chtm|cldc|cmd\-|co(mp|nd)|craw|da(it|ll|ng)|dbte|dc\-s|devi|dica|dmob|do(c|p)o|ds(12|\-d)|el(49|ai)|em(l2|ul)|er(ic|k0)|esl8|ez([4-7]0|os|wa|ze)|fetc|fly(\-|_)|g1 u|g560|gene|gf\-5|g\-mo|go(\.w|od)|gr(ad|un)|haie|hcit|hd\-(m|p|t)|hei\-|hi(pt|ta)|hp( i|ip)|hs\-c|ht(c(\-| |_|a|g|p|s|t)|tp)|hu(aw|tc)|i\-(20|go|ma)|i230|iac( |\-|\/)|ibro|idea|ig01|ikom|im1k|inno|ipaq|iris|ja(t|v)a|jbro|jemu|jigs|kddi|keji|kgt( |\/)|klon|kpt |kwc\-|kyo(c|k)|le(no|xi)|lg( g|\/(k|l|u)|50|54|\-[a-w])|libw|lynx|m1\-w|m3ga|m50\/|ma(te|ui|xo)|mc(01|21|ca)|m\-cr|me(rc|ri)|mi(o8|oa|ts)|mmef|mo(01|02|bi|de|do|t(\-| |o|v)|zz)|mt(50|p1|v )|mwbp|mywa|n10[0-2]|n20[2-3]|n30(0|2)|n50(0|2|5)|n7(0(0|1)|10)|ne((c|m)\-|on|tf|wf|wg|wt)|nok(6|i)|nzph|o2im|op(ti|wv)|oran|owg1|p800|pan(a|d|t)|pdxg|pg(13|\-([1-8]|c))|phil|pire|pl(ay|uc)|pn\-2|po(ck|rt|se)|prox|psio|pt\-g|qa\-a|qc(07|12|21|32|60|\-[2-7]|i\-)|qtek|r380|r600|raks|rim9|ro(ve|zo)|s55\/|sa(ge|ma|mm|ms|ny|va)|sc(01|h\-|oo|p\-)|sdk\/|se(c(\-|0|1)|47|mc|nd|ri)|sgh\-|shar|sie(\-|m)|sk\-0|sl(45|id)|sm(al|ar|b3|it|t5)|so(ft|ny)|sp(01|h\-|v\-|v )|sy(01|mb)|t2(18|50)|t6(00|10|18)|ta(gt|lk)|tcl\-|tdg\-|tel(i|m)|tim\-|t\-mo|to(pl|sh)|ts(70|m\-|m3|m5)|tx\-9|up(\.b|g1|si)|utst|v400|v750|veri|vi(rg|te)|vk(40|5[0-3]|\-v)|vm40|voda|vulc|vx(52|53|60|61|70|80|81|83|85|98)|w3c(\-| )|webc|whit|wi(g |nc|nw)|wmlb|wonu|x700|yas\-|your|zeto|zte\-/i',substr($useragent,0,4));
     }

templates/security/register.html.twig

@@ -3,7 +3,9 @@
 {% block title %}Регистрация пациента{% endblock %}
 
 {% block js %}
-    <script id="smartCaptcha" src="https://smartcaptcha.yandexcloud.net/captcha.js"></script>
+    {% if 'sova.local' not in app.request.host %}
+        <script id="smartCaptcha" src="https://smartcaptcha.yandexcloud.net/captcha.js"></script>
+    {% endif %}
 {% endblock %}
 
 {% block top %}