From 274123e3424da9ce0e3bed540d39ab71c66b3b4c Mon Sep 17 00:00:00 2001
From: eensander <sanderve@protonmail.com>
Date: Thu, 30 Jun 2022 20:30:10 +0200
Subject: [PATCH] final touches before closing branch

---
 .../graph/GraphModelerConfigBar.vue           | 41 +++++++++++--------
 src/components/shared/ModalComponent.vue      |  2 +-
 src/components/shared/easymde/EasymdeView.vue | 10 +----
 src/style/index.scss                          | 11 +++++
 4 files changed, 37 insertions(+), 27 deletions(-)

diff --git a/src/components/graph/GraphModelerConfigBar.vue b/src/components/graph/GraphModelerConfigBar.vue
index dd61d12..954917d 100644
--- a/src/components/graph/GraphModelerConfigBar.vue
+++ b/src/components/graph/GraphModelerConfigBar.vue
@@ -1,37 +1,41 @@
 <template>
 
-    <!-- <span>{{ cell }}</span> -->
-
     <div v-if="cell == null">
         <span class="block p-2 text-gray-700">Select a node or edge to configure</span>
     </div>
 
     <div v-else-if="cell.isNode()" class="w-full">
 
-
         <ModalComponent :modal="modal_field_content" v-if="modal_field_content.is_open">
             <div class="bg-white px-4 pt-5 pb-4 sm:p-6 sm:pb-4">
                 <div class="mt-3 text-center sm:mt-0 sm:ml-4 sm:text-left">
                     <h3 class="text-lg leading-6 font-medium text-gray-900" id="modal-title">Edit content</h3>
                     <div class="mt-2">
                         <p class="text-sm text-gray-500">
-                            You can use <a href="https://commonmark.org/help/">markdown</a> to add styles to the content displayed for this node. 
+                            You can use <a href="https://commonmark.org/help/" target="_blank">markdown</a> to add styles to the content displayed for this node. 
                             Text containing HTML code will be rendered as HTML.
+                            <span 
+                                class="ml-1 text-sm text-gray-800 cursor-pointer select-none hover:text-gray-700 hover:underline"
+                                @click="modal_field_content.data.read_more = !modal_field_content.data.read_more">
+                                {{ modal_field_content.data.read_more ? 'less' : 'more' }}
+                            </span>
                         </p>
+                        
                         <template v-if="modal_field_content.data.read_more">
                             <p class="text-sm text-gray-500 mt-1">
-                                Docassmble uses Mako as a templating system, to allow for including variables and code in content. More on how to use this at <a href="https://docassemble.org/docs/markup.html#mako">Docassemble</a>.
+                                Docassmble uses Mako as a templating system, to allow for including variables and code in content. More on how to use this at <a href="https://docassemble.org/docs/markup.html#mako" target="_blank">Docassemble</a>.
                             </p>
                             <p class="text-sm text-gray-500 mt-1">
                                 Note that when referencing a variable, even in an 'if' statement, the block corresponding to the variable will be first shown to the user (regardless of the order specified in the graph).
-                                To show a variable only when it is defined, one can use the <span class="code text-gray-700">defined('variable')</span> function within Mako, as described at <a href="https://docassemble.org/docs/markup.html#mako">Docassemble</a>.
+                                To show a variable only when it is defined, one can use the <span class="code text-gray-700">defined('variable')</span> function within Mako, as described at <a href="https://docassemble.org/docs/markup.html#mako" target="_blank">Docassemble</a>.
                             </p>
                         </template>
                     </div>
                     <div class="mt-4">
                         <EasymdeView
                             :options="{}"
-                            v-model="modal_field_content_editor"
+                            :value="modal_field_content_editor"
+                            @input="e => modal_field_content_editor = e"
                             ></EasymdeView>
                     </div>
                 </div>
@@ -43,10 +47,14 @@
         </ModalComponent>
 
         <div class="">
-            <span class="m-2 font-bold block text-2xl border-b border-gray-300">{{ titleCase((cell.data as AntvNodeData).gd.type) }} node</span>
+            <!-- <span class="m-2 font-bold block text-xl border-b border-gray-300">{{ titleCase((cell.data as AntvNodeData).gd.type) }} node</span> -->
+            <span class="m-2 text-ellipsis overflow-hidden font-mono block text-xl border-b border-gray-300">{{
+                (cell.getData() as AntvNodeData).gd.variable ?? 
+                    `${ (cell.getData() as AntvNodeData).gd.type }_${cell.id.toString().substring(0, 8)}`
+                }}</span>
             
             <div class="p-2">
-                <button @click="cell?.remove()" class="action-btn-remove">Remove</button>
+                <button @click="cell?.remove()" class="btn btn-red">Remove</button>
             </div>
 
             <div v-for="(fields, field_group) in current_fields" :key="field_group">
@@ -60,7 +68,7 @@
                             <span class="text-gray-700 block mb-1 text-sm">Variable</span>
                             <div>
                                 <!-- <input class="w-full" type="text" :placeholder="cell.id" v-model="node_variable" /> -->
-                                <input class="style-soft w-full" type="text" v-model="node_variable" :placeholder="`${ (cell.getData() as AntvNodeData).gd.type }_${cell.id.toString().substring(0, 8)}`" />
+                                <input class="style-soft w-full font-mono" type="text" v-model="node_variable" :placeholder="`${ (cell.getData() as AntvNodeData).gd.type }_${cell.id.toString().substring(0, 8)}`" />
                             </div>
                         </label>
 
@@ -145,7 +153,7 @@
 
 <script lang="ts" setup>
 
-    import { computed, reactive, ref } from 'vue';
+    import { computed, ref } from 'vue';
     import { default_edge_label, node_types, node_type_default, AntvNodeData } from '@/utils/antv-model'
 
     import { Cell, Edge, Node } from '@antv/x6'
@@ -170,7 +178,6 @@
     }
 
     /* Computing current fields */
-
     const current_fields = computed(() => {
         const field = props.cell?.getData()?.node_type ?? node_type_default;
         let current_node_fields = null;
@@ -242,10 +249,6 @@
         }
     });
 
-    const editor_content_change = (editor: EasyMDE) => {
-        console.log("change event", editor.value())
-    }
-
 </script>
 
 <style lang="scss" scoped>
@@ -259,8 +262,10 @@ button.action-btn-remove {
     @apply hover:border-red-400  text-red-900 px-3 py-0.5 rounded;
 }
 
-p a {
-    @apply text-blue-600 hover:text-blue-500
+.modal-container {
+    p a {
+        @apply text-blue-600 hover:text-blue-500
+    }
 }
 
 </style>
\ No newline at end of file
diff --git a/src/components/shared/ModalComponent.vue b/src/components/shared/ModalComponent.vue
index dd5aba0..c888431 100644
--- a/src/components/shared/ModalComponent.vue
+++ b/src/components/shared/ModalComponent.vue
@@ -25,7 +25,7 @@
 import { Modal } from '@/utils/modal';
 
 const props = defineProps<{
-    modal: Modal
+    modal: Modal<object>
 }>();
 
 let down_target: Element | null = null;
diff --git a/src/components/shared/easymde/EasymdeView.vue b/src/components/shared/easymde/EasymdeView.vue
index 7df0c82..fc86daa 100644
--- a/src/components/shared/easymde/EasymdeView.vue
+++ b/src/components/shared/easymde/EasymdeView.vue
@@ -2,28 +2,22 @@
     <textarea ref="editorRef"></textarea>
 </template>
 <script setup lang="ts">
-// inspired from: https://github.com/nhn/tui.editor/blob/66db3f8d4099141332fab88e88a8afd191808648/apps/vue-editor/src/Editor.vue
-
-import { onMounted, onUnmounted, Ref, ref, watch } from 'vue';
+import { onMounted, onUnmounted, Ref, ref } from 'vue';
 
 import EasyMDE from 'easymde';
 import 'easymde/dist/easymde.min.css';
 
+// :value and @input to mimick v-model. (does this work?)
 const props = defineProps<{
-    // initialValue?: string,
     options: EasyMDE.Options,
     value?: string
 }>();
 const emit = defineEmits(['change', 'input'])
 
-
 const editor: Ref<EasyMDE | null> = ref(null);
 const editorRef: Ref<HTMLElement | null> = ref(null);
 
 onMounted(() => {
-    // // https://stackoverflow.com/a/71094531/17864167
-
-    console.log(props);
     
     if (editorRef.value != null) {
         const options = {
diff --git a/src/style/index.scss b/src/style/index.scss
index a37cbaf..157e778 100644
--- a/src/style/index.scss
+++ b/src/style/index.scss
@@ -140,4 +140,15 @@ button.btn {
     &:hover {
         @apply ring-4 ring-gray-200 border-gray-400 cursor-pointer ;
     }
+
+    &.btn-red {
+        @apply bg-red-600 border-0 text-white;
+        &:focus {
+            @apply outline-none ring-2 ring-offset-2 ring-red-500;
+        }
+        &:hover {
+            @apply bg-red-500;
+            @apply ring-0 cursor-pointer;
+        }
+    }
 }