skopix 2.0.67 → 2.0.69

package/cli/commands/dashboard.js

@@ -1919,6 +1919,27 @@ export async function dashboardCommand(options) {
         sendJSON(res, 200, result);
         return;
       }
+      if (pathname === '/api/step-library/sync-selectors' && method === 'POST') {
+        const { fromSelectors, toSelector, toName } = JSON.parse(await readBody(req));
+        const allTests = await listAllTests(suitesDir);
+        let updated = 0;
+        for (const test of allTests) {
+          if (!test.steps || !test.steps.length) continue;
+          let changed = false;
+          const newSteps = test.steps.map(step => {
+            const sSel = (step.stableSelector||step.selector||'').toLowerCase();
+            if (fromSelectors.includes(sSel)) {
+              changed = true;
+              updated++;
+              return { ...step, stableSelector: toSelector, selector: toSelector, description: toName || step.description };
+            }
+            return step;
+          });
+          if (changed) await updateTest(suitesDir, test.scope, test.id, { ...test, steps: newSteps });
+        }
+        sendJSON(res, 200, { updated });
+        return;
+      }
       if (pathname === '/api/step-library/sync' && method === 'POST') {
         const result = await syncTestsToLibrary(suitesDir);
         sendJSON(res, 200, result);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "skopix",
-  "version": "2.0.67",
+  "version": "2.0.69",
   "description": "Browser-based QA tool — record tests by using your app, replay them deterministically, generate Playwright code automatically",
   "main": "cli/index.js",
   "bin": {

package/web/app/index.html

@@ -5870,9 +5870,18 @@ function openMergeSteps() {
   // Override the confirm button
   const actions = document.querySelector('.confirm-actions');
   if (actions) {
-    actions.innerHTML = `
-      <button class="btn btn-ghost" onclick="closeConfirm()">Cancel</button>
-      <button class="btn btn-primary" onclick="confirmMergeSteps(${JSON.stringify(ids)})">Merge</button>`;
+    const mergeBtn = document.createElement('button');
+    mergeBtn.className = 'btn btn-primary';
+    mergeBtn.textContent = 'Merge';
+    mergeBtn.dataset.mergeIds = JSON.stringify(ids);
+    mergeBtn.addEventListener('click', () => confirmMergeSteps(JSON.parse(mergeBtn.dataset.mergeIds)));
+    actions.innerHTML = '';
+    const cancelBtn = document.createElement('button');
+    cancelBtn.className = 'btn btn-ghost';
+    cancelBtn.textContent = 'Cancel';
+    cancelBtn.addEventListener('click', closeConfirm);
+    actions.appendChild(cancelBtn);
+    actions.appendChild(mergeBtn);
   }
   document.getElementById('confirm-overlay').classList.add('open');
 }
@@ -5885,15 +5894,29 @@ async function confirmMergeSteps(ids) {
   const toDelete = selected.filter(s => s.id !== canonicalId);
   const totalUses = selected.reduce((sum, s) => sum + (s.usageCount||0), 0);
   closeConfirm();
+
+  // Update canonical usage count
   await fetch(API_BASE + '/api/step-library/' + encodeURIComponent(canonicalId), {
     method: 'PUT',
     headers: { 'Content-Type': 'application/json' },
     body: JSON.stringify({ ...canonical, usageCount: totalUses })
   });
+
+  // Delete the merged ones
   for (const s of toDelete) {
     await fetch(API_BASE + '/api/step-library/' + encodeURIComponent(s.id), { method: 'DELETE' });
   }
-  showToast(`Merged ${selected.length} steps into "${canonical.name}"`);
+
+  // Update all tests that used any of the merged selectors to use the canonical selector
+  const allMergedSelectors = selected.map(s => (s.stableSelector||s.selector||'').toLowerCase());
+  const canonicalSel = canonical.stableSelector || canonical.selector;
+  const res = await fetch(API_BASE + '/api/step-library/sync-selectors', {
+    method: 'POST',
+    headers: { 'Content-Type': 'application/json' },
+    body: JSON.stringify({ fromSelectors: allMergedSelectors, toSelector: canonicalSel, toName: canonical.name })
+  });
+  const data = await res.json();
+  showToast(`Merged into "${canonical.name}" — ${data.updated || 0} test step${data.updated !== 1 ? 's' : ''} updated`);
   await loadLibraryView();
 }