From 9cec1e9a3e0de04e03154da89022649d9fcec530 Mon Sep 17 00:00:00 2001
From: Grzegorz Godlewski <gg@gitgis.com>
Date: Thu, 26 Sep 2024 15:58:41 +0200
Subject: [PATCH] Fix UI quirks

---
 apps/ui/assets/main.css                          |  6 +++---
 apps/ui/src/components/DangerSettings.vue        | 12 ++++++++++--
 apps/ui/src/components/GitSettings.vue           |  7 +++++--
 apps/ui/src/components/prismFix.ts               |  7 ++++++-
 src/containers/server/routes/ConfigController.ts |  1 +
 src/git/GitScanner.ts                            | 11 +++++++++++
 6 files changed, 36 insertions(+), 8 deletions(-)

diff --git a/apps/ui/assets/main.css b/apps/ui/assets/main.css
index 5b94394c..1e36073d 100644
--- a/apps/ui/assets/main.css
+++ b/apps/ui/assets/main.css
@@ -53,7 +53,7 @@ var(--bs-table-hover-bg);
 
 .files-list__item > i {
   display: inline-block;
-  width: 0px;
+  width: 0;
   padding-right: 20px;
 }
 
@@ -203,9 +203,9 @@ a[disabled] {
   padding: 2em 0 2em 3em;
 }
 
-.prism-editor__editor {
+.prism-editor__editor, .prism-editor-wrapper {
   font-size: 16px;
-  font-family: monospace !important;
+  font-family: monospace;
 }
 pre.prism-editor__editor {
   overflow-x: scroll; /* Adds a horizontal scrollbar when necessary */
diff --git a/apps/ui/src/components/DangerSettings.vue b/apps/ui/src/components/DangerSettings.vue
index 9ec03902..85d7cf44 100644
--- a/apps/ui/src/components/DangerSettings.vue
+++ b/apps/ui/src/components/DangerSettings.vue
@@ -1,5 +1,5 @@
 <template>
-  <div class="container mainbar__content-height" v-if="drive_config.config">
+  <div class="container mainbar__content-height" v-if="config">
     <StatusToolBar :active-tab="activeTab" />
 
     <div class="overflow-scroll d-flex flex-row mt-3">
@@ -15,7 +15,7 @@
           <h4>Git</h4>
 
           <button class="btn btn-warning" type="button" @click="resetToLocal">Reset to local</button>
-          <button v-if="drive_config.remote_url" class="btn btn-warning" type="button" @click="resetToRemote">Reset to remote</button>
+          <button v-if="remote_url" class="btn btn-warning" type="button" @click="resetToRemote">Reset to remote</button>
           <button class="btn btn-warning" type="button" @click="removeUntracked">Remove untracked files</button>
           <button class="btn btn-danger" type="button" @click="nukeGitDir()"><i class="fa-solid fa-explosion"></i> Nuke .git directory</button>
 
@@ -45,6 +45,14 @@ export default {
       type: String
     },
     drive_config: {}
+  },
+  computed: {
+    config() {
+      return this.drive_config?.config || {};
+    },
+    remote_url() {
+      return this.drive_config?.remote_url || '';
+    }
   }
 };
 </script>
diff --git a/apps/ui/src/components/GitSettings.vue b/apps/ui/src/components/GitSettings.vue
index b8d641de..3607d3de 100644
--- a/apps/ui/src/components/GitSettings.vue
+++ b/apps/ui/src/components/GitSettings.vue
@@ -82,6 +82,9 @@ export default {
     }
   },
   computed: {
+    public_key() {
+      return this.drive_config?.public_key || '';
+    },
     github_url() {
         const remote_url = this.remote_url || '';
         if (remote_url.startsWith('git@github.com:')) {
@@ -108,7 +111,7 @@ export default {
       });
       await response.json();
       await this.$root.changeDrive(this.driveId);
-      await this.emit('changed');
+      await this.$emit('changed');
     },
     async saveAndReset() {
       await this.save();
@@ -123,7 +126,7 @@ export default {
         method: 'post'
       });
 
-      await this.emit('changed');
+      await this.$emit('changed');
     }
   }
 };
diff --git a/apps/ui/src/components/prismFix.ts b/apps/ui/src/components/prismFix.ts
index 79a62f36..e4700281 100644
--- a/apps/ui/src/components/prismFix.ts
+++ b/apps/ui/src/components/prismFix.ts
@@ -57,9 +57,14 @@ Prism.hooks.add('before-highlight', function (env) {
 });
 
 Prism.hooks.add('wrap', function (env) {
+  function removeHash(url) {
+    url = (url || '').replace(/#.*$/, '');
+    return url;
+  }
+
   if ('url' === env.type) {
     env.tag = 'a';
-    env.attributes.href = env.content;
+    env.attributes.href = removeHash(env.content);
     env.attributes['data-to-rewrite'] = 'true';
   }
   if (/-link$/.test(env.type)) {
diff --git a/src/containers/server/routes/ConfigController.ts b/src/containers/server/routes/ConfigController.ts
index 5ad87618..d201dad9 100644
--- a/src/containers/server/routes/ConfigController.ts
+++ b/src/containers/server/routes/ConfigController.ts
@@ -80,6 +80,7 @@ export class ConfigController extends Controller {
 
     const gitScanner = new GitScanner(this.logger, transformedFileSystem.getRealPath(), 'wikigdrive@wikigdrive.com');
     await gitScanner.initialize();
+    await gitScanner.setSafeDirectory();
 
     const googleFileSystem = await this.filesService.getSubFileService(driveId, '');
     const userConfigService = new UserConfigService(googleFileSystem);
diff --git a/src/git/GitScanner.ts b/src/git/GitScanner.ts
index 653cef0a..af8655a7 100644
--- a/src/git/GitScanner.ts
+++ b/src/git/GitScanner.ts
@@ -48,6 +48,13 @@ export class GitScanner {
 
     let [ stdout, stderr ] = [ null, null ];
 
+    if (!opts.env) {
+      opts.env = {};
+    }
+    if (!opts.env['HOME']) {
+      opts.env['HOME'] = process.env.HOME;
+    }
+
     try {
       await new Promise((resolve, reject) => {
         exec(command, { cwd: this.rootPath, env: opts.env, maxBuffer: 1024 * 1024 }, (error, stdoutResult, stderrResult) => {
@@ -622,6 +629,10 @@ export class GitScanner {
     }
   }
 
+  async setSafeDirectory() {
+    await this.exec('git config --global --add safe.directory ' + this.rootPath);
+  }
+
   async getBranchCommit(branch: string): Promise<string> {
     try {
       const res = await this.exec(`git rev-parse ${branch}`, { skipLogger: true });