fix tinycolor2 bundle

.github/workflows/test.yml

@@ -23,7 +23,10 @@ jobs:
           export DEBIAN_FRONTEND=noninteractive
           sudo add-apt-repository -y ppa:mozillateam/ppa
           sudo apt-get update
-          sudo apt-get install -y chromium-browser firefox-esr
+          sudo apt-get install -y \
+            chromium-browser \
+            firefox-esr \
+            xvfb
 
       - name: Update npm
         run: npm install -g npm@10
@@ -35,4 +38,4 @@ jobs:
         run: npm run lint -- --no-fix
 
       - name: Run karma tests
-        run: npm run test
+        run: xvfb-run -a npm test

package-lock.json

@@ -1,12 +1,12 @@
 {
   "name": "sqliteviz",
-  "version": "0.27.1",
+  "version": "0.28.2",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "sqliteviz",
-      "version": "0.27.1",
+      "version": "0.28.2",
       "license": "Apache-2.0",
       "dependencies": {
         "@sigma/export-image": "^3.0.0",
@@ -32,6 +32,7 @@
         "sigma": "^3.0.1",
         "sql.js": "file:./lib/sql-js",
         "tiny-emitter": "^2.1.0",
+        "tinycolor2": "^1.4.2",
         "veaury": "^2.5.1",
         "vue": "^3.5.11",
         "vue-final-modal": "^4.5.5",
@@ -13341,6 +13342,11 @@
         "react": "^0.14.0 || ^15.0.0"
       }
     },
+    "node_modules/react-chart-editor/node_modules/tinycolor2": {
+      "version": "1.6.0",
+      "resolved": "https://registry.npmjs.org/tinycolor2/-/tinycolor2-1.6.0.tgz",
+      "integrity": "sha512-XPaBkWQJdsf3pLKJV9p4qN/S+fm2Oj8AIPo1BTUhg5oxkvm9+SVEGFdhyOz7tTdUTfvxMiAs4sp6/eZO2Ew+pw=="
+    },
     "node_modules/react-color": {
       "version": "2.19.3",
       "license": "MIT",
@@ -15514,8 +15520,12 @@
       "license": "MIT"
     },
     "node_modules/tinycolor2": {
-      "version": "1.6.0",
-      "license": "MIT"
+      "version": "1.4.2",
+      "resolved": "https://registry.npmjs.org/tinycolor2/-/tinycolor2-1.4.2.tgz",
+      "integrity": "sha512-vJhccZPs965sV/L2sU4oRQVAos0pQXwsvTLkWYdqJ+a8Q5kPFzJTuOFwy7UniPli44NKQGAglksjvOcpo95aZA==",
+      "engines": {
+        "node": "*"
+      }
     },
     "node_modules/tinyglobby": {
       "version": "0.2.12",

package.json

@@ -1,6 +1,6 @@
 {
   "name": "sqliteviz",
-  "version": "0.28.0",
+  "version": "0.28.2",
   "license": "Apache-2.0",
   "private": true,
   "type": "module",
@@ -36,6 +36,7 @@
     "sigma": "^3.0.1",
     "sql.js": "file:./lib/sql-js",
     "tiny-emitter": "^2.1.0",
+    "tinycolor2": "^1.4.2",
     "veaury": "^2.5.1",
     "vue": "^3.5.11",
     "vue-final-modal": "^4.5.5",

src/components/Graph/CirclePackLayoutSettings.vue

@@ -40,7 +40,6 @@
 import { applyPureReactInVue } from 'veaury'
 import Field from 'react-chart-editor/lib/components/fields/Field'
 import NumericInput from 'react-chart-editor/lib/components/widgets/NumericInput'
-import Dropdown from 'react-chart-editor/lib/components/widgets/Dropdown'
 import Multiselect from 'vue-multiselect'
 import 'react-chart-editor/lib/react-chart-editor.css'
 
@@ -48,7 +47,6 @@ export default {
   components: {
     Field: applyPureReactInVue(Field),
     NumericInput: applyPureReactInVue(NumericInput),
-    Dropdown: applyPureReactInVue(Dropdown),
     Multiselect
   },
   props: {

src/components/Graph/GraphEditor.vue

@@ -11,7 +11,7 @@
                 documentation</a
               >.
             </Field>
-            <Field label="Object type" ref="objectTypeField">
+            <Field ref="objectTypeField" label="Object type">
               <Dropdown
                 :options="keysOptions"
                 :value="settings.structure.objectType"
@@ -172,15 +172,15 @@
             <div class="force-atlas-buttons">
               <Button
                 variant="secondary"
-                @click="resetFA2LayoutSettings"
                 class="test_fa2_reset"
+                @click="resetFA2LayoutSettings"
               >
                 Reset
               </Button>
               <Button
                 variant="primary"
-                @click="toggleFA2Layout"
                 class="test_fa2_toggle"
+                @click="toggleFA2Layout"
               >
                 <template #node:icon>
                   <div
@@ -225,6 +225,7 @@ import Button from 'react-chart-editor/lib/components/widgets/Button'
 import Field from 'react-chart-editor/lib/components/fields/Field'
 import RandomLayoutSettings from '@/components/Graph/RandomLayoutSettings.vue'
 import ForceAtlasLayoutSettings from '@/components/Graph/ForceAtlasLayoutSettings.vue'
+// eslint-disable-next-line max-len
 import AdvancedForceAtlasLayoutSettings from '@/components/Graph/AdvancedForceAtlasLayoutSettings.vue'
 import CirclePackLayoutSettings from '@/components/Graph/CirclePackLayoutSettings.vue'
 import FA2Layout from 'graphology-layout-forceatlas2/worker'
@@ -436,7 +437,9 @@ export default {
       this.updateLayout(this.settings.layout.type)
       this.renderer = new Sigma(this.graph, this.$refs.graph, {
         renderEdgeLabels: true,
-        allowInvalidContainer: true
+        allowInvalidContainer: true,
+        labelColor: { attribute: 'labelColor', color: '#444444' },
+        edgeLabelColor: { attribute: 'labelColor', color: '#a2b1c6' }
       })
       if (this.settings.layout.type === 'forceAtlas2') {
         this.autoRunFA2Layout()

src/components/svg/graph.vue

@@ -7,27 +7,33 @@
     xmlns="http://www.w3.org/2000/svg"
   >
     <path
-      d="M5 4C5 5.10457 4.10457 6 3 6C1.89543 6 1 5.10457 1 4C1 2.89543 1.89543 2 3 2C4.10457 2 5 2.89543 5 4Z"
+      d="M5 4C5 5.10457 4.10457 6 3 6C1.89543 6 1 5.10457 1 4C1 2.89543 
+      1.89543 2 3 2C4.10457 2 5 2.89543 5 4Z"
       fill="#A2B1C6"
     />
     <path
-      d="M17 7.5C17 8.88071 15.8807 10 14.5 10C13.1193 10 12 8.88071 12 7.5C12 6.11929 13.1193 5 14.5 5C15.8807 5 17 6.11929 17 7.5Z"
+      d="M17 7.5C17 8.88071 15.8807 10 14.5 10C13.1193 10 12 8.88071 12 
+      7.5C12 6.11929 13.1193 5 14.5 5C15.8807 5 17 6.11929 17 7.5Z"
       fill="#A2B1C6"
     />
     <path
-      d="M8 13.5C8 14.8807 6.88071 16 5.5 16C4.11929 16 3 14.8807 3 13.5C3 12.1193 4.11929 11 5.5 11C6.88071 11 8 12.1193 8 13.5Z"
+      d="M8 13.5C8 14.8807 6.88071 16 5.5 16C4.11929 16 3 14.8807 3 13.5C3 
+      12.1193 4.11929 11 5.5 11C6.88071 11 8 12.1193 8 13.5Z"
       fill="#A2B1C6"
     />
     <path
-      d="M2.93128 5.31436L3.90527 5.08778L5.48693 11.8867L4.51294 12.1133L2.93128 5.31436Z"
+      d="M2.93128 5.31436L3.90527 5.08778L5.48693 11.8867L4.51294 
+      12.1133L2.93128 5.31436Z"
       fill="#A2B1C6"
     />
     <path
-      d="M12.9447 7.79159L13.5548 8.58392L7.30516 13.3962L6.69507 12.6038L12.9447 7.79159Z"
+      d="M12.9447 7.79159L13.5548 8.58392L7.30516 13.3962L6.69507 
+      12.6038L12.9447 7.79159Z"
       fill="#A2B1C6"
     />
     <path
-      d="M14.1316 6.51712L3.13166 3.51723L2.86844 4.48202L13.8684 7.48191L14.1316 6.51712Z"
+      d="M14.1316 6.51712L3.13166 3.51723L2.86844 4.48202L13.8684 
+      7.48191L14.1316 6.51712Z"
       fill="#A2B1C6"
     />
   </svg>

src/components/svg/stop.vue

@@ -7,7 +7,8 @@
     xmlns="http://www.w3.org/2000/svg"
   >
     <path
-      d="M3 4C3 3.44772 3.44772 3 4 3H14C14.5523 3 15 3.44772 15 4V14C15 14.5523 14.5523 15 14 15H4C3.44772 15 3 14.5523 3 14V4Z"
+      d="M3 4C3 3.44772 3.44772 3 4 3H14C14.5523 3 15 3.44772 15 4V14C15 
+      14.5523 14.5523 15 14 15H4C3.44772 15 3 14.5523 3 14V4Z"
       fill="#A2B1C6"
     />
   </svg>

src/views/MainView/Workspace/Tabs/Tab/DataView/Graph/index.vue

@@ -60,6 +60,21 @@ export default {
       resizeObserver: null
     }
   },
+  computed: {
+    dataSourceIsValid() {
+      return !this.dataSources || dataSourceIsValid(this.dataSources)
+    }
+  },
+  watch: {
+    async showViewSettings() {
+      await this.$nextTick()
+      this.handleResize()
+    },
+    dataSources() {
+      this.$emit('update:exportToPngEnabled', !!this.dataSources)
+      this.$emit('update:exportToClipboardEnabled', !!this.dataSources)
+    }
+  },
   created() {
     this.$emit('update:exportToSvgEnabled', false)
     this.$emit('update:exportToHtmlEnabled', false)
@@ -73,21 +88,6 @@ export default {
   beforeUnmount() {
     this.resizeObserver.unobserve(this.$refs.graphContainer)
   },
-  watch: {
-    async showViewSettings() {
-      await this.$nextTick()
-      this.handleResize()
-    },
-    dataSources() {
-      this.$emit('update:exportToPngEnabled', !!this.dataSources)
-      this.$emit('update:exportToClipboardEnabled', !!this.dataSources)
-    }
-  },
-  computed: {
-    dataSourceIsValid() {
-      return !this.dataSources || dataSourceIsValid(this.dataSources)
-    }
-  },
   methods: {
     getOptionsForSave() {
       return this.$refs.graphEditor.settings