mbeditor 0.5.4 → 0.5.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6ce79d4cc314cce5975277d04c12a0d7d5fa13629fa0447d66cf742bf05aee3e
-  data.tar.gz: 820ef6cac234149c3f3e69069c5255598b27d161dea7c60939d06999d16d9c4a
+  metadata.gz: 041ce3cd1e0cc69e9c9d4fbf4a3578d8681ce4ed54cbaf6351f36e4642d161b9
+  data.tar.gz: e65f221f2bad0d72957225ba5836104878e27865c4e86b82b45857509922d571
 SHA512:
-  metadata.gz: 87cc5da11a46b54e9399ecb678c450a6f71053807a2f80bb22b788ef7c4c359b2cbcb2cc6bce4e1691763336ecd9c9ef4d9540f6a80f587f013188142a7d0b1c
-  data.tar.gz: 3cd29156eda196448f5f31eed27e5b8d7483e7a8f2f91d70ab6adc58a039a3e5cb19568a6b1a7bc94e38bee904cc4a495e9c698428117e8cd5aba4c09f6e9342
+  metadata.gz: 9f51620ece5851894a862bc5ed080bb0a4d73a4263a987b069b212ed15d705f3a2ce1383dcb6850578bd2bb6f1aa5a00734132d11ab62cf91cfb945cf8042a5d
+  data.tar.gz: da12cdf3ddceaf8d91f173ca11df458e88f4c294294eef005401a6b2ecc3457d5d76f4ce9bb148d6fbd18e572a0b669f154ef4675855ebb170fe63859aef82dd

data/app/assets/javascripts/mbeditor/components/MbeditorApp.js

@@ -1740,6 +1740,29 @@ var MbeditorApp = function MbeditorApp() {
     EditorStore.setStatus('Line endings changed to ' + newEOL, 'info');
   };
 
+  var handleRefreshWorkspace = function handleRefreshWorkspace() {
+    setLoading(function (prev) {
+      return _extends({}, prev, { refreshWorkspace: true });
+    });
+    GitService.fetchStatus()["catch"](function () {});
+    FileService.getTree().then(function (data) {
+      var newData = data || [];
+      setTreeData(function (prevData) {
+        if (JSON.stringify(newData) === JSON.stringify(prevData)) return prevData;
+        SearchService.buildIndex(newData);
+        return newData;
+      });
+      checkOpenTabsForExternalChanges();
+      EditorStore.setStatus("Workspace refreshed", "success");
+    })["catch"](function (err) {
+      EditorStore.setStatus("Failed to refresh workspace", "error");
+    })["finally"](function () {
+      setLoading(function (prev) {
+        return _extends({}, prev, { refreshWorkspace: false });
+      });
+    });
+  };
+
   var handleFormat = function handleFormat() {
     if (!activeTab) return;
 
@@ -2971,6 +2994,13 @@ var MbeditorApp = function MbeditorApp() {
               actions: React.createElement(
                 SectionActionGroup,
                 { ariaLabel: "Project actions" },
+                React.createElement(SidebarActionButton, {
+                  title: "Refresh workspace",
+                  iconClass: "fas fa-sync-alt",
+                  ariaBusy: !!loading.refreshWorkspace,
+                  onClick: handleRefreshWorkspace,
+                  disabled: !!loading.refreshWorkspace
+                }),
                 React.createElement(SidebarActionButton, {
                   title: "Collapse all folders",
                   iconClass: "fas fa-compress-alt",

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

@@ -61,6 +61,7 @@ var SearchService = (function () {
 
       function traverse(nodes) {
         nodes.forEach(function(n) {
+          if (n.excluded) return; // skip excluded paths and their descendants
           if (n.type === 'file') {
             docs.push({ id: idCounter++, path: n.path, name: n.name, type: 'file' });
           } else if (n.type === 'folder') {

data/app/controllers/mbeditor/editors_controller.rb

@@ -702,7 +702,8 @@ module Mbeditor
 
     # GET /mbeditor/manifest.webmanifest — PWA manifest
     def pwa_manifest
-      base = request.script_name.to_s.sub(%r{/$}, "")
+      _mount = request.script_name.to_s.gsub(%r{(^/+|/+$)}, "")
+      base = _mount.empty? ? "" : "/#{_mount}"
       manifest = {
         name: "Mbeditor — #{Rails.root.basename}",
         short_name: "Mbeditor",
@@ -1070,10 +1071,14 @@ module Mbeditor
         rel = relative_path(full)
 
         if File.directory?(full)
-          { name: name, type: "folder", path: rel, children: build_tree(full, depth: depth + 1) }
+          node = { name: name, type: "folder", path: rel, children: build_tree(full, depth: depth + 1) }
+          node[:excluded] = true if excluded_path?(rel, name)
+          node
         else
           size = File.size(full) rescue nil
-          { name: name, type: "file", path: rel, size: size }
+          node = { name: name, type: "file", path: rel, size: size }
+          node[:excluded] = true if excluded_path?(rel, name)
+          node
         end
       end
     rescue Errno::EACCES

data/app/views/layouts/mbeditor/application.html.erb

@@ -7,7 +7,7 @@
   <meta name="theme-color" content="#1e1e2e" />
   <meta name="mobile-web-app-capable" content="yes" />
   <meta name="apple-mobile-web-app-capable" content="yes" />
-  <% pwa_base = request.script_name.to_s.sub(%r{/$}, '') %>
+  <% _mount = request.script_name.to_s.gsub(%r{(^/+|/+$)}, ''); pwa_base = _mount.empty? ? '' : "/#{_mount}" %>
   <link rel="manifest" href="<%= "#{pwa_base}/manifest.webmanifest" %>" />
   <script>
     if ('serviceWorker' in navigator) {
@@ -32,7 +32,7 @@
   <script defer src="<%= asset_path('minisearch.min.js') %>"></script>
   <script defer src="<%= asset_path('marked.min.js') %>"></script>
   <!-- ── Monaco loader (sync — inline body script calls require()) ── -->
-  <% base_path = request.script_name.to_s.sub(%r{/$}, '') %>
+  <% base_path = pwa_base %>
   <script>var require = { paths: { vs: '<%= json_escape("#{base_path}/monaco-editor/vs") %>', 'monaco-editor/esm/vs': '<%= json_escape("#{base_path}/monaco-editor/vs") %>', 'monaco-vim': '<%= json_escape(asset_path("monaco-vim.js").sub(/\.js$/, "")) %>' } };</script>
   <script src="<%= "#{base_path}/monaco-editor/vs/loader.js" %>"></script>
   <!-- ── Emmet + Extra themes (non-AMD, deferred — used inside Monaco callback) ── -->

data/lib/mbeditor/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Mbeditor
-  VERSION = "0.5.4"
+  VERSION = "0.5.5"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mbeditor
 version: !ruby/object:Gem::Version
-  version: 0.5.4
+  version: 0.5.5
 platform: ruby
 authors:
 - Oliver Noonan