Merge branch 'master' into 2025-01-10_settings_home_screen

google · Feb 11, 2025 · d775c9f · d775c9f
2 parents ee55473 + d677b4a
commit d775c9f
Show file tree

Hide file tree

Showing 6 changed files with 535 additions and 1,357 deletions.
diff --git a/.github/workflows/linters.yml b/.github/workflows/linters.yml
@@ -36,28 +36,6 @@ jobs:
       - uses: actions/checkout@v2
       - uses: psf/black@stable
 
-  ESLint-frontend:
-    runs-on: ubuntu-latest
-    defaults:
-      run:
-        working-directory: ./timesketch/frontend
-    strategy:
-      matrix:
-        os: [ubuntu-20.04, ubuntu-22.04]
-        node-version: ["18"]
-    steps:
-      - uses: actions/checkout@v2
-      - name: Set up Node ${{ matrix.node-version }}
-        uses: actions/setup-node@v2
-        with:
-          node-version: ${{ matrix.node-version }}
-      - name: Install dependencies
-        run: yarn add [email protected]
-      - name: Run eslint
-        run: |
-          git config pull.rebase false && git fetch -p origin master
-          for FILE in `git --no-pager diff origin/master --name-only --diff-filter=ACMR | grep -e \.vue$ -e \.js$ | grep -v dist\/js | grep ^timesketch\/frontend\/ | sed s/'^timesketch\/frontend\/'/''/`; do echo "Running eslint against ${FILE}"; yarn run eslint ${FILE}; done
-
   ESLint-frontend-ng:
     runs-on: ubuntu-latest
     defaults:
@@ -66,7 +44,7 @@ jobs:
     strategy:
       matrix:
         os: [ubuntu-20.04, ubuntu-22.04]
-        node-version: ["18"]
+        node-version: ["20"]
     steps:
       - uses: actions/checkout@v2
       - name: Set up Node ${{ matrix.node-version }}

diff --git a/.github/workflows/unit-tests.yml b/.github/workflows/unit-tests.yml
@@ -38,7 +38,7 @@ jobs:
     strategy:
       matrix:
         os: [ubuntu-20.04, ubuntu-22.04]
-        node-version: ["18"]
+        node-version: ["20"]
     steps:
       - uses: actions/checkout@v2
       - name: Set up Node ${{ matrix.node-version }}

diff --git a/docker/dev/build/Dockerfile b/docker/dev/build/Dockerfile
@@ -30,7 +30,7 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
   && rm -rf /var/lib/apt/lists/*
 
 # Install NodeJS for frontend development
-RUN curl -sL https://deb.nodesource.com/setup_18.x -o nodesource_setup.sh
+RUN curl -sL https://deb.nodesource.com/setup_20.x -o nodesource_setup.sh
 RUN bash nodesource_setup.sh
 RUN apt-get update && apt-get install -y --no-install-recommends \
     nodejs \

diff --git a/timesketch/frontend-ng/package.json b/timesketch/frontend-ng/package.json
@@ -11,6 +11,7 @@
   },
   "dependencies": {
     "@mdi/font": "^7.1.96",
+    "@popperjs/core": "^2.4.0",
     "apexcharts": "^3.27.1",
     "axios": "^1.7.2",
     "cytoscape": "^3.24.0",
@@ -48,8 +49,7 @@
     "eslint-config-prettier": "^8.3.0",
     "eslint-plugin-vue": "^5.0.0",
     "happy-dom": "^15.10.2",
-    "node-sass": "^8.0.0",
-    "sass": "~1.32",
+    "sass": "1.77.6",
     "sass-loader": "^10.1.1",
     "vite-plugin-vue2": "^2.0.3",
     "vitest": "~1.0.4",

diff --git a/timesketch/frontend-ng/src/components/LeftPanel/TagsList.vue b/timesketch/frontend-ng/src/components/LeftPanel/TagsList.vue
@@ -93,6 +93,7 @@ export default {
     allTagsAndLabels() {
       const labelOrder = ['__ts_star', '__ts_comment', 'bad', 'suspicious', 'good']
       return [...this.labels, ...this.assignedQuickTags, ...this.customTags]
+        .filter(item => item.tag || item.label) // Filter out items without tag or label
         .sort((a, b) => {
           const aLabel = a.tag || a.label
           const bLabel = b.tag || b.label