git commands, show mode changes in workspace

Author: andreax79

airflow_code_editor/git.py

@@ -248,6 +248,7 @@ def prepare_git_env() -> Dict[str, str]:
     # Don't prompt on the terminal
     env['GIT_TERMINAL_PROMPT'] = '0'
     env['GIT_ASKPASS'] = '/bin/true'
+    env['GIT_EDITOR'] = '/bin/false'
     # Author
     git_author_name = get_plugin_config('git_author_name')
     if not git_author_name:

airflow_code_editor/static/airflow_code_editor.js

@@ -64,6 +64,20 @@ export function showNotification(options) {
     });
 }
 
+export function showError(message, options) {
+    if (vueApp) {
+        vueApp.showError(message, options);
+    }
+}
+
+export function showWarning(message, options) {
+    if (vueApp) {
+        options = (options !== undefined) ? options : {};
+        options['type'] = options.type || 'warning';
+        vueApp.showError(message, options);
+    }
+}
+
 export function normalize(path) {
     if (path[0] != '/') {
         path = '/' + path;
@@ -128,24 +142,42 @@ export function initCsrfToken(tokenParam) {
 
 export async function git_async(args, options) {
     options = (options !== undefined) ? options : {};
+    const title = options?.title || 'Git';
     const payload = { args: [].concat.apply([], args.filter(x => x != null)) };  // flat the array
-    const pre = (options.type == 'terminal') ? '$ git ' + payload.args.join(' ') + '\n' : '';
+    const command = '$ git ' + payload.args.join(' ') + '\n';
     try {
         const response = await axios.post(prepareHref('repo'), payload);
         if (response.data.returncode != 0) {
-            const message = pre + response.data.error.message;
-            showNotification({ title: options?.title || 'Git', message: message, type: 'error' });
+            const message = response.data?.error?.message || response.data?.data;
+            if (options?.type == 'terminal') {
+                showWarning(command + message, options);
+            } else {
+                showNotification({ title: title, message: message, type: 'error' });
+            }
             return null;
         }
         // Return code is 0 but there is stderr output: this is a warning message
         if (response.data.error) {
-            const message = pre + response.data.error.message;
-            showNotification({ title: options?.title || 'Git', message: message, type: 'warn' });
+            const message = response.data.error.message;
+            if (options?.type == 'terminal') {
+                showWarning(command + message, options);
+            } else {
+                showNotification({ title: title, message: message, type: 'warn' });
+            }
+        }
+        if (options?.forceTerminal) {
+            // Force terminal output
+            const message = command + response.data.data;
+            showWarning(message, options);
         }
         return response.data.data
     } catch(error) {
-        const message = error.response && error.response.data.error ? error.response.data.error.message : error;
-        showNotification({ title: options?.title || 'Git', message: message, type: 'error' });
+        const message = error?.response?.data?.error?.message || error;
+        if (options?.type == 'terminal') {
+            showError(message, options);
+        } else {
+            showNotification({ title: title, message: message, type: 'error' });
+        }
         return null;
     }
 }

airflow_code_editor/static/airflow_code_editor.js.map

@@ -12,7 +12,8 @@
     display: block;
     flex: 1;
     overflow: auto;
-    background-color: #fff;
+    background-color: #f2f2f2;
+    padding-top: 1em;
 }
 .show-diff {
     font-family: monospace;
@@ -22,13 +23,11 @@
     padding-left: 2em;
 }
 .show-diff .diff-file-header {
-    font-weight: bold;
-    line-height: 3.6em;
     padding-left: 1em;
-    border-bottom: 1px solid #eee;
-    margin-bottom: 1em;
-    background-color: #f6f6f6;
-    font-family: sans-serif;
+    font-family: monospace;
+}
+.show-diff .diff-filename{
+    font-weight: bold;
 }
 .show-diff .diff-line-add {
     background-color: #e6ffec;
@@ -62,12 +61,14 @@ export default defineComponent({
             let classes = '';
             let skip = false;
             if ((!this.inFileHeader) && (line.startsWith('diff --git'))) {
-                skip = true;
+                //skip = true;
                 this.inFileHeader = true;
             } else if (this.inFileHeader) { // file header
-                skip = true;
+                //skip = true;
+                this.inFileHeader = true;
+                classes += " diff-file-header";
                 if (line.startsWith('+++ ')) { // filename
-                    classes += " diff-file-header";
+                    classes += " diff-filename";
                     line = line.substring(5);
                     if (line.startsWith('dev/null')) {
                         line = this.last.substring(5);

airflow_code_editor/static/css/style.css

@@ -12,6 +12,8 @@
 <style>
 .airflow-code-editor-modal-terminal {
     width: 95%;
+    font-family: "Menlo", "Monaco", "Lucida Console", "Liberation Mono", "DejaVu Sans Mono", "Bitstream Vera Sans Mono", "Courier New", serif;
+    line-height: 1.4em;
 }
 .airflow-code-editor-modal-terminal label {
     white-space: pre;

src/commons.js

@@ -28,7 +28,7 @@ window.search = async function(query) {
 
 window.git = async function(args) {
     let gitArgs = shlex.split(args);
-    let result = await git_async(gitArgs);
+    let result = await git_async(gitArgs, {type: 'terminal', forceTerminal: true});
     if (result) {
         console.log(result);
     }