Merge branch 'develop' into feat/4758

Stepan-Kirjakov · Stepan-Kirjakov · commit d84376f40b1a · 2026-03-09T22:08:11.000+04:00
diff --git a/.github/workflows/add-documentation-to-repo.yaml b/.github/workflows/add-documentation-to-repo.yaml
@@ -16,7 +16,7 @@ jobs:
         mongodb-version: [ 7.0.21 ]
     steps:
       - name: Harden Runner
-        uses: step-security/harden-runner@a90bcbc6539c36a85cdfeb73f7e2f433735f215b # v2.15.0
+        uses: step-security/harden-runner@58077d3c7e43986b6b15fba718e8ea69e387dfcc # v2.15.1
         with:
           egress-policy: audit
 
diff --git a/.github/workflows/api-after-commit.yml b/.github/workflows/api-after-commit.yml
@@ -19,7 +19,7 @@ jobs:
         mongodb-version: [ 7.0.21 ]
     steps:
       - name: Harden Runner
-        uses: step-security/harden-runner@a90bcbc6539c36a85cdfeb73f7e2f433735f215b # v2.15.0
+        uses: step-security/harden-runner@58077d3c7e43986b6b15fba718e8ea69e387dfcc # v2.15.1
         with:
           egress-policy: audit
 
diff --git a/.github/workflows/api-manual.yml b/.github/workflows/api-manual.yml
@@ -27,7 +27,7 @@ jobs:
         mongodb-version: [7.0.21]
     steps:
       - name: Harden Runner
-        uses: step-security/harden-runner@a90bcbc6539c36a85cdfeb73f7e2f433735f215b # v2.15.0
+        uses: step-security/harden-runner@58077d3c7e43986b6b15fba718e8ea69e387dfcc # v2.15.1
         with:
           egress-policy: audit
 
diff --git a/.github/workflows/api-schedule-all.yml b/.github/workflows/api-schedule-all.yml
@@ -18,7 +18,7 @@ jobs:
         mongodb-version: [ 7.0.21 ]
     steps:
       - name: Harden Runner
-        uses: step-security/harden-runner@a90bcbc6539c36a85cdfeb73f7e2f433735f215b # v2.15.0
+        uses: step-security/harden-runner@58077d3c7e43986b6b15fba718e8ea69e387dfcc # v2.15.1
         with:
           egress-policy: audit
 
diff --git a/.github/workflows/api-schedule-vm0033.yml b/.github/workflows/api-schedule-vm0033.yml
@@ -18,7 +18,7 @@ jobs:
         mongodb-version: [ 7.0.21 ]
     steps:
       - name: Harden Runner
-        uses: step-security/harden-runner@a90bcbc6539c36a85cdfeb73f7e2f433735f215b # v2.15.0
+        uses: step-security/harden-runner@58077d3c7e43986b6b15fba718e8ea69e387dfcc # v2.15.1
         with:
           egress-policy: audit
 
diff --git a/.github/workflows/flow-pull-request-formatting.yaml b/.github/workflows/flow-pull-request-formatting.yaml
@@ -31,7 +31,7 @@ jobs:
     runs-on: guardian-linux-medium
     steps:
       - name: Harden Runner
-        uses: step-security/harden-runner@a90bcbc6539c36a85cdfeb73f7e2f433735f215b # v2.15.0
+        uses: step-security/harden-runner@58077d3c7e43986b6b15fba718e8ea69e387dfcc # v2.15.1
         with:
           egress-policy: audit
 
@@ -46,7 +46,7 @@ jobs:
 
     steps:
       - name: Harden Runner
-        uses: step-security/harden-runner@a90bcbc6539c36a85cdfeb73f7e2f433735f215b # v2.15.0
+        uses: step-security/harden-runner@58077d3c7e43986b6b15fba718e8ea69e387dfcc # v2.15.1
         with:
           egress-policy: audit
 
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -13,7 +13,7 @@ jobs:
         node-version: [ 20.19.5 ]
     steps:
       - name: Harden Runner
-        uses: step-security/harden-runner@a90bcbc6539c36a85cdfeb73f7e2f433735f215b # v2.15.0
+        uses: step-security/harden-runner@58077d3c7e43986b6b15fba718e8ea69e387dfcc # v2.15.1
         with:
           egress-policy: audit
 
diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
@@ -16,7 +16,7 @@ jobs:
       contents: read
     steps:
       - name: Harden Runner
-        uses: step-security/harden-runner@a90bcbc6539c36a85cdfeb73f7e2f433735f215b # v2.15.0
+        uses: step-security/harden-runner@58077d3c7e43986b6b15fba718e8ea69e387dfcc # v2.15.1
         with:
           egress-policy: audit
 
diff --git a/.github/workflows/ui-manual.yml b/.github/workflows/ui-manual.yml
@@ -18,7 +18,7 @@ jobs:
         mongodb-version: [7.0.21]
     steps:
       - name: Harden Runner
-        uses: step-security/harden-runner@a90bcbc6539c36a85cdfeb73f7e2f433735f215b # v2.15.0
+        uses: step-security/harden-runner@58077d3c7e43986b6b15fba718e8ea69e387dfcc # v2.15.1
         with:
           egress-policy: audit
 
diff --git a/frontend/src/app/modules/schema-engine/schema-configuration/schema-configuration.component.scss b/frontend/src/app/modules/schema-engine/schema-configuration/schema-configuration.component.scss
@@ -403,6 +403,12 @@ form {
 
 *[disabled-dropdown="true"] {
     pointer-events: none !important;
+
+    &::ng-deep {
+        .p-dropdown-trigger {
+            display: none !important;
+        }
+    }
 }
 
 .rmv-condition-btn {
@@ -419,17 +425,18 @@ form {
 }
 
 .if-mode-dropdown {
-  display: grid;
-  grid-template-columns: 1fr auto 1fr;
-  align-items: center;
-  gap: 1rem;
-  height: unset;
-  margin-bottom: 1.5rem;
-
-  &::before, &::after {
-    content: "";
-    border-top: 2px dashed #A6B3BF;
-  }
+    display: grid;
+    grid-template-columns: 1fr auto 1fr;
+    align-items: center;
+    gap: 1rem;
+    height: unset;
+    margin-bottom: 1.5rem;
+
+    &::before,
+    &::after {
+        content: "";
+        border-top: 2px dashed #A6B3BF;
+    }
 }
 
 .if-text-mode {
diff --git a/frontend/src/index.html b/frontend/src/index.html
@@ -87,6 +87,19 @@
             }
         };
 
+        const constrainPosition = (btn, x, y) => {
+            const rect = btn.getBoundingClientRect();
+            const viewport = { w: window.innerWidth, h: window.innerHeight };
+            
+            const maxX = viewport.w - rect.width;
+            const maxY = viewport.h - rect.height;
+            
+            return {
+                x: getMin(x, 0, maxX),
+                y: getMin(y, 0, maxY)
+            };
+        };
+
         const applyButtonPosition = (btn, x, y) => {
             btn.style.position = 'fixed';
             btn.style.right = 'auto';
@@ -212,9 +225,14 @@
         };
 
         const setupDrag = (btn) => {
+            const rect = btn.getBoundingClientRect();
+            const startPos = constrainPosition(btn, rect.left, Math.max(0, rect.top - 50));
+            applyButtonPosition(btn, startPos.x, startPos.y);
+
             const saved = readSavedPosition();
             if (saved) {
-                applyButtonPosition(btn, saved.x, saved.y);
+                const constrained = constrainPosition(btn, saved.x, saved.y);
+                applyButtonPosition(btn, constrained.x, constrained.y);
             }
 
             let dragActive = false;
@@ -271,13 +289,8 @@
 
                 moved = true;
 
-                const maxLeft = window.innerWidth - btn.offsetWidth;
-                const maxTop = window.innerHeight - btn.offsetHeight;
-
-                const x = getMin(originLeft + dragX, 0, maxLeft);
-                const y = getMin(originTop + dragY, 0, maxTop);
-
-                applyButtonPosition(btn, x, y);
+                const constrained = constrainPosition(btn, originLeft + dragX, originTop + dragY);
+                applyButtonPosition(btn, constrained.x, constrained.y);
             });
 
             document.addEventListener('mouseup', () => {
@@ -295,12 +308,35 @@
                 clickBlockOnce = true;
 
                 const r = btn.getBoundingClientRect();
-                savePosition(r.left, r.top);
+                const finalPos = constrainPosition(btn, r.left, r.top);
+                applyButtonPosition(btn, finalPos.x, finalPos.y);
+                savePosition(finalPos.x, finalPos.y);
+            });
+        };
+
+
+        const observeButtonClasses = (btn) => {
+            const observer = new MutationObserver((mutations) => {
+                if (!btn.classList.contains('hidden')) {
+                    const rect = btn.getBoundingClientRect();
+                    const constrained = constrainPosition(btn, rect.left, rect.top);
+                    
+                    if (Math.abs(rect.left - constrained.x) > 1 || Math.abs(rect.top - constrained.y) > 1) {
+                        applyButtonPosition(btn, constrained.x - 15, constrained.y);
+                        savePosition(constrained.x, constrained.y);
+                    }
+                }
+            })
+            
+            observer.observe(btn, { 
+                attributes: true, 
+                attributeFilter: ['class'] 
             });
         };
 
         const boot = (btn) => {
             setupDrag(btn);
+            observeButtonClasses(btn);
 
             const windowElement = getWindowEl();
             if (windowElement) {
@@ -318,6 +354,18 @@
         } else {
             start();
         }
+
+        window.addEventListener('resize', () => {
+            const btn = getButtonEl();
+            if (btn && isButtonVisible(btn)) {
+                const rect = btn.getBoundingClientRect();
+                const constrained = constrainPosition(btn, rect.left, rect.top);
+                if (Math.abs(rect.left - constrained.x) > 1 || Math.abs(rect.top - constrained.y) > 1) {
+                    applyButtonPosition(btn, constrained.x, constrained.y);
+                    savePosition(constrained.x, constrained.y);
+                }
+            }
+        });
     </script>
     <script>
         const TARGET_IFRAME_ID = 'gitbook-widget-iframe';
