wip fix changes check

socketsupply · Apr 6, 2024 · 3d35804 · 3d35804
1 parent ef41021
commit 3d35804
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 4 deletions.
diff --git a/src/components/editor.js b/src/components/editor.js
@@ -74,6 +74,7 @@ class EditorTabs extends Tonic {
       label: node.label,
       id: node.id,
       path: node.id,
+      isReadOnly: node.isReadOnly,
       isRootSettingsFile: node.isRootSettingsFile,
       model: monaco.editor.createModel(),
       state: null,
@@ -318,7 +319,17 @@ class AppEditor extends Tonic {
       const mappings = app.state.settings.extensionLanguageMappings
       const lang = mappings[ext] || ext.slice(1)
       monaco.editor.setModelLanguage(this.editor.getModel(), lang)
-      let data = projectNode.value || await fs.promises.readFile(projectNode.id, 'utf8')
+
+      let data = projectNode.value
+
+      if (!data && projectNode.id) {
+        try {
+          data = await fs.promises.readFile(projectNode.id, 'utf8')
+        } catch (err) {
+          console.error(err)
+          return
+        }
+      }
 
       if (path.extname(projectNode.id) === '.json') {
         try {
@@ -462,6 +473,8 @@ class AppEditor extends Tonic {
     const value = this.editor.getValue()
     const app = this.props.parent
 
+    if (tab.isReadyOnly) return
+
     if (app.state.settings.previewMode) {
       this.saveCurrentTab()
       return

diff --git a/src/components/patch-requests.js b/src/components/patch-requests.js
@@ -118,7 +118,9 @@ class PatchRequests extends Tonic {
     const app = this.props.app
     const bundleId = app.state.currentProject.bundleId
 
-    const { data: dataPatches } = await app.db.patches.readAll({ gte: bundleId, lte: bundleId + '~' })
+    const opts = { lt: bundleId.slice(0, -1) + '\xFF', gt: bundleId }
+
+    const { data: dataPatches } = await app.db.patches.readAll(opts)
 
     const patches = []
 

diff --git a/src/index.js b/src/index.js
@@ -189,8 +189,8 @@ class AppView extends Tonic {
         title: preview.title,
         titleBarStyle: preview.titleBarStyle, // ie 'hiddenInset'
         trafficLightPosition: preview.trafficLightPosition, // ie '10x26'
-        backgroundColorDark: 'rgba(46, 46, 46, 1)',
-        backgroundColorLight: 'rgba(255, 255, 255, 1)',
+        backgroundColorDark: 'rgba(46, 46, 46, 0.1)',
+        backgroundColorLight: 'rgba(255, 255, 255, 0.1)',
         aspectRatio: preview.aspectRatio, // ie '9:19.5'
         width: Math.floor(width / scale),
         height: Math.floor(height / scale)