mbeditor 0.13.0 → 0.14.0

data/app/assets/javascripts/mbeditor/file_import.js

@@ -13,6 +13,16 @@ var FileImport = (function () {
   // otherwise reject the request as a 500 before the server guard can run.
   var MAX_ENTRIES = 100;
 
+  // Every collector returns this same shape; `truncated` is read off the full
+  // list, so it must be computed before the slice.
+  function capResult(list, foldersSkipped) {
+    return {
+      entries: list.slice(0, MAX_ENTRIES),
+      truncated: list.length > MAX_ENTRIES,
+      foldersSkipped: !!foldersSkipped
+    };
+  }
+
   function hasExternalFiles(dataTransfer) {
     if (!dataTransfer || !dataTransfer.types) return false;
     return Array.prototype.indexOf.call(dataTransfer.types, 'Files') !== -1;
@@ -41,20 +51,12 @@ var FileImport = (function () {
       for (var j = 0; j < files.length; j++) {
         flat.push({ file: files[j], relativePath: files[j].name });
       }
-      return Promise.resolve({
-        entries: flat.slice(0, MAX_ENTRIES),
-        truncated: flat.length > MAX_ENTRIES,
-        foldersSkipped: !!(items && items.length > flat.length)
-      });
+      return Promise.resolve(capResult(flat, items && items.length > flat.length));
     }
 
     var collected = [];
     return walkAll(roots, collected).then(function () {
-      return {
-        entries: collected.slice(0, MAX_ENTRIES),
-        truncated: collected.length > MAX_ENTRIES,
-        foldersSkipped: false
-      };
+      return capResult(collected, false);
     });
   }
 
@@ -99,11 +101,7 @@ var FileImport = (function () {
       var f = fileList[i];
       out.push({ file: f, relativePath: stripLeadingSlash(f.webkitRelativePath || f.name) });
     }
-    return {
-      entries: out.slice(0, MAX_ENTRIES),
-      truncated: out.length > MAX_ENTRIES,
-      foldersSkipped: false
-    };
+    return capResult(out, false);
   }
 
   // Where in the workspace does this set of files already live?

data/app/assets/javascripts/mbeditor/file_service.js

@@ -140,56 +140,47 @@ axios.interceptors.response.use(function (response) {
 //
 // The editor keeps working while migrations are pending — the server-side
 // bypass (Mbeditor::Rack::PendingMigrationBypass) is what makes that true — so
-// this is purely informational now. It is driven by a response *header* rather
-// than by a failed request, for two reasons: after the bypass there is no
-// failed request left to hang it on, and a header rides every response, so a
-// migration created mid-session raises the banner too, and running the
-// migration clears it without a reload.
+// this is purely informational. It is driven by a response *header* rather than
+// by a failed request, for two reasons: after the bypass there is no failed
+// request left to hang it on, and a header rides every response, so a migration
+// created mid-session raises the warning too, and running the migration clears
+// it without a reload.
 //
-// The old failed-response trigger is kept alongside: a PendingMigrationError
-// raised somewhere the bypass does not cover still shows the banner.
-var MIGRATION_BANNER_ID = 'mbeditor-migration-banner';
-
-function _showMigrationBanner() {
-  if (!document.body || document.getElementById(MIGRATION_BANNER_ID)) return;
-  var banner = document.createElement('div');
-  banner.id = MIGRATION_BANNER_ID;
-  banner.style.cssText = [
-    'position:fixed', 'top:0', 'left:0', 'right:0', 'z-index:99999',
-    'background:#f1c40f', 'color:#1e1e1e', 'font-family:system-ui,sans-serif',
-    'font-size:13px', 'padding:8px 16px', 'display:flex',
-    'align-items:center', 'gap:12px'
-  ].join(';');
-  banner.innerHTML =
-        '<strong>Pending migrations detected.</strong>' +
-        ' Run <code style="background:rgba(0,0,0,.15);padding:1px 5px;border-radius:3px">rails db:migrate</code>' +
-        ' then reload — editing still works in the meantime.' +
-        '<button onclick="this.parentNode.remove()" style="margin-left:auto;background:none;border:none;' +
-        'cursor:pointer;font-size:16px;line-height:1;padding:0 4px" aria-label="Dismiss">\u00d7</button>';
-  document.body.prepend(banner);
-}
-
-function _hideMigrationBanner() {
-  var existing = document.getElementById(MIGRATION_BANNER_ID);
-  if (existing) existing.remove();
+// Only an explicit "1"/"0" counts. A response with no header at all is no
+// evidence either way: an error page rendered by ActionDispatch::DebugExceptions
+// never carries one (that middleware sits above the bypass), and treating its
+// absence as "cleared" made the warning flicker off and back on.
+//
+// The state lives as a class on <body> so the CSS can recolour the status bar
+// without React; the event is what the status bar's warning listens to.
+var MIGRATION_PENDING_CLASS = 'mbeditor-migration-pending';
+var MIGRATION_PENDING_EVENT = 'mbeditor:pending-migration';
+
+function _setPendingMigration(pending) {
+  if (!document.body) return;
+  if (document.body.classList.contains(MIGRATION_PENDING_CLASS) === pending) return;
+  document.body.classList.toggle(MIGRATION_PENDING_CLASS, pending);
+  window.dispatchEvent(new CustomEvent(MIGRATION_PENDING_EVENT, { detail: pending }));
 }
 
-// Mirrors Mbeditor::Rack::PendingMigrationBypass::PENDING_HEADER. Absent means
-// the check passed, so the banner is cleared as soon as the migration is run —
-// no reload needed.
+// Mirrors Mbeditor::Rack::PendingMigrationBypass::PENDING_HEADER.
 function _notePendingMigrationHeader(response) {
   if (!response || !response.headers) return;
-  if (response.headers['x-mbeditor-pending-migration']) _showMigrationBanner();
-  else _hideMigrationBanner();
+  var value = response.headers['x-mbeditor-pending-migration'];
+  if (value === undefined || value === null || value === '') return;
+  _setPendingMigration(value !== '0');
 }
 
 axios.interceptors.response.use(function (response) {
   _notePendingMigrationHeader(response);
   return response;
 }, function (error) {
+  // A PendingMigrationError raised somewhere the bypass does not cover.
   if (error && error.response && error.response.data &&
       error.response.data.pending_migration_error) {
-    _showMigrationBanner();
+    _setPendingMigration(true);
+  } else if (error && error.response) {
+    _notePendingMigrationHeader(error.response);
   }
   return Promise.reject(error);
 });
@@ -242,9 +233,17 @@ var FileService = (function () {
   // Multipart import of files dragged in from outside the browser. The
   // default 30 s axios timeout is too tight for a large drop on a slow disk,
   // so this one call gets a longer leash.
-  function importFiles(formData) {
+  // onProgress(percentOrNull) fires as the body uploads, then once more with
+  // null when the bytes are away and the server is still writing. A big drop
+  // on a slow link otherwise sits on one static message long enough to look
+  // like it has hung.
+  function importFiles(formData, onProgress) {
     return axios.post(window.mbeditorBasePath() + '/import', formData, {
-      timeout: 120000
+      timeout: 120000,
+      onUploadProgress: onProgress ? function (e) {
+        var done = e.loaded === e.total;
+        onProgress(!done && e.total ? Math.round((e.loaded / e.total) * 100) : null);
+      } : undefined
     }).then(function (res) { return res.data; });
   }
 
@@ -276,30 +275,21 @@ var FileService = (function () {
 
   // line (1-based, optional) narrows the run to the single test at that line;
   // the server ignores it unless `path` IS the test file.
-  // Server-reported ceilings (seconds), seeded from /workspace. The request
-  // timeout is derived from them rather than hard-coded: two independent
+  // Server-reported ceiling (seconds), seeded from /workspace. The request
+  // timeout is derived from it rather than hard-coded: two independent
   // numbers meant that raising config.test_timeout past the client's own cap
   // made the browser abort a run the server was still executing, and the user
   // saw a generic network error instead of the server's message.
-  var testTimeouts = { test: 180, testAll: 1800 };
-  function setTestTimeouts(t) {
-    if (t && t.test > 0) testTimeouts.test = t.test;
-    if (t && t.testAll > 0) testTimeouts.testAll = t.testAll;
-  }
-  // Margin for boot, JSON encoding and the trip back, so the server's own
-  // timeout is always the one that fires first and reports why.
-  function requestTimeout(seconds) { return (seconds + 30) * 1000; }
+  var testTimeout = 180;
+  function setTestTimeout(seconds) { if (seconds > 0) testTimeout = seconds; }
 
   function runTests(path, line) {
     var payload = { path: path };
     if (line) payload.line = line;
+    // Margin for boot, JSON encoding and the trip back, so the server's own
+    // timeout is always the one that fires first and reports why.
     return axios.post(window.mbeditorBasePath() + '/test', payload,
-      { timeout: requestTimeout(testTimeouts.test) }).then(function(res) { return res.data; });
-  }
-
-  function runAllTests() {
-    return axios.post(window.mbeditorBasePath() + '/test_all', {},
-      { timeout: requestTimeout(testTimeouts.testAll) }).then(function(res) { return res.data; });
+      { timeout: (testTimeout + 30) * 1000 }).then(function(res) { return res.data; });
   }
 
   function ping() {
@@ -585,8 +575,7 @@ var FileService = (function () {
     rubyRename: rubyRename,
     getModelGraph: getModelGraph,
     runRubocop: runRubocop,
-    runAllTests: runAllTests,
-    setTestTimeouts: setTestTimeouts,
+    setTestTimeout: setTestTimeout,
     getExceptions: getExceptions,
     clearExceptions: clearExceptions,
     getRelatedFiles: getRelatedFiles,

data/app/assets/javascripts/mbeditor/git_service.js

@@ -1,3 +1,10 @@
+// Git's seven unmerged porcelain codes. Defined here because git_service.js
+// loads before both consumers (GitPanel's status badges and the status bar's
+// conflict chip) and one list is the point: testing the first character
+// instead reads AA as "added" and DD as "deleted", so four of the seven
+// conflicts get mislabelled.
+window.MBEDITOR_UNMERGED_STATUSES = { DD: 1, AU: 1, UD: 1, UA: 1, DU: 1, AA: 1, UU: 1 };
+
 var GitService = (function () {
   function applyGitInfo(data) {
     var files = data.workingTree || data.files || [];
@@ -71,6 +78,7 @@ var GitService = (function () {
   // unreachable rather than failing over and over in the console.
   function fetchStatusLite(opts) {
     var cfg = (opts && opts.background) ? { mbeditorBackground: true } : {};
+    var startedAt = Date.now();
     return axios.get(window.mbeditorBasePath() + '/git_status', cfg)
       .then(function(res) {
         var data = res.data;
@@ -79,6 +87,8 @@ var GitService = (function () {
         var st = EditorStore.getState();
         var prevInfo = st.gitInfo;
         var files = data.files || [];
+        var audit = window.MbeditorAudit;
+        if (audit) audit.rec(audit.EV.GIT_POLL, Date.now() - startedAt, files.length);
         var gitSig = function(arr) { return arr.map(function(f) { return f.path + '\x00' + f.status; }).join('\x01'); };
         var branchChanged = (data.branch || "") !== (st.gitBranch || "");
         var treeChanged = gitSig(files) !== gitSig(st.gitFiles || []);
@@ -123,7 +133,11 @@ var GitService = (function () {
 
         return data;
       })
-      .catch(function () {}); // transient poll errors retry on the next tick
+      .catch(function () {
+        // transient poll errors retry on the next tick
+        var audit = window.MbeditorAudit;
+        if (audit) audit.rec(audit.EV.ERR, audit.EV.GIT_POLL);
+      });
   }
 
   function fetchStatus() {

data/app/assets/javascripts/mbeditor/history_service.js

@@ -13,6 +13,10 @@ var HistoryService = (function () {
   var _idleTimers = {};
 
   var IDLE_MS = 30000;
+  // Server-side history format. 2 means tracking starts after the file load, so
+  // the load is the base rather than an insert-at-origin op (see #92/#93). The
+  // server uses this to tell a legacy payload from a current one.
+  var FORMAT_VERSION = 2;
 
   function _key(branch, filePath) {
     return branch + ':' + filePath;
@@ -40,16 +44,6 @@ var HistoryService = (function () {
     }
   }
 
-  function stopTracking(filePath) {
-    var rec = _tracking[filePath];
-    if (!rec) return;
-    var k = _key(rec.branch, filePath);
-    clearTimeout(_idleTimers[k]);
-    delete _idleTimers[k];
-    flush(rec.branch, filePath);
-    delete _tracking[filePath];
-  }
-
   function setReplayInProgress(filePath, inProgress) {
     if (inProgress) {
       _replayingPaths[filePath] = true;
@@ -86,7 +80,7 @@ var HistoryService = (function () {
     clearTimeout(_idleTimers[k]);
     delete _idleTimers[k];
 
-    var body = { branch: branch, path: filePath, ops: ops };
+    var body = { branch: branch, path: filePath, ops: ops, v: FORMAT_VERSION };
     if (_bases.hasOwnProperty(k)) {
       body.base = _bases[k];
       delete _bases[k];
@@ -161,10 +155,8 @@ var HistoryService = (function () {
   return {
     beginTracking:       beginTracking,
     resumeTracking:      resumeTracking,
-    stopTracking:        stopTracking,
     setReplayInProgress: setReplayInProgress,
     recordOps:           recordOps,
-    flush:               flush,
     flushAll:            flushAll,
     flushForPath:        flushForPath,
     fetchHistory:        fetchHistory

data/app/assets/javascripts/mbeditor/search_service.js

@@ -79,13 +79,31 @@ var SearchService = (function () {
     });
   }
 
+  // Fuzziness per term: edit distance is `fuzzy * term.length` inside
+  // MiniSearch, so short terms get none (at 3 chars every 3-letter token in the
+  // tree is within one edit and the list becomes noise) and longer ones get
+  // roughly one typo per 4 characters.
+  function _fuzzyFor(term) {
+    return term.length > 3 ? 0.25 : false;
+  }
+
   // Search files (and optionally folders) in the local MiniSearch index.
+  // Fuzzy + prefix, so a misspelled or half-typed query still finds the file;
+  // ranking back in QuickOpenDialog puts exact matches first, so loosening the
+  // match here cannot demote one.
   // Also performs a case-insensitive substring scan so that partial-word
-  // queries like "project" reliably find "projects_controller.rb".
+  // queries like "project" reliably find "projects_controller.rb" — the
+  // tokenizer splits on punctuation, so a query spanning a separator
+  // ("models/user") tokenizes into terms no single token can satisfy.
   // Returns merged results; MiniSearch scored entries come first.
   function searchFiles(query) {
     if (!query) return [];
-    var msResults = _miniSearch.search(query, { prefix: true, fuzzy: false, combineWith: 'AND' });
+    var msResults = _miniSearch.search(query, {
+      prefix: true,
+      fuzzy: _fuzzyFor,
+      combineWith: 'AND',
+      boost: { name: 2 }
+    });
     // Substring fallback — catch anything MiniSearch missed
     var q = query.toLowerCase();
     var msIds = new Set(msResults.map(function(r) { return r.id; }));
@@ -127,6 +145,7 @@ var SearchService = (function () {
     var controller = new AbortController();
     _searchController = controller;
 
+    var startedAt = Date.now();
     return axios.get(window.mbeditorBasePath() + '/search', {
       params: { q: query, offset: off, limit: lim, regex: useRegex ? 'true' : 'false', match_case: matchCase ? 'true' : 'false', whole_word: wholeWord ? 'true' : 'false' },
       signal: controller.signal
@@ -137,6 +156,12 @@ var SearchService = (function () {
         var hasMore    = !Array.isArray(data) && !!(data && data.has_more);
         var totalCount = (data && data.total_count != null) ? data.total_count : null;
 
+        var audit = window.MbeditorAudit;
+        if (audit) {
+          audit.rec(audit.EV.SEARCH, audit.code('searchBackend', window.MBEDITOR_SEARCH_BACKEND),
+                    Date.now() - startedAt, results.length);
+        }
+
         var payload = { results: results, hasMore: hasMore, totalCount: totalCount };
         _cacheSet(key, payload);
 
@@ -152,6 +177,8 @@ var SearchService = (function () {
         if (axios.isCancel(err) || (err && err.name === 'CanceledError')) {
           return { results: [], hasMore: false, totalCount: null };
         }
+        var audit = window.MbeditorAudit;
+        if (audit) audit.rec(audit.EV.ERR, audit.EV.SEARCH);
         EditorStore.setStatus("Search failed: " + err.message, "error");
         return { results: [], hasMore: false, totalCount: null };
       });