automatic merge to finish v1.4.0

cars10 · Jan 22, 2025 · 486b0f2 · 486b0f2
2 parents aa37bb0 + 823dced
commit 486b0f2
Show file tree

Hide file tree

Showing 58 changed files with 1,157 additions and 509 deletions.
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -12,7 +12,7 @@ jobs:
     name: Build desktop app for ${{ matrix.platform }}
     strategy:
       matrix:
-        platform: [ macos-latest, ubuntu-latest, windows-latest ]
+        platform: [ macos-latest, ubuntu-24.04, windows-latest ]
     runs-on: ${{ matrix.platform }}
     env:
       TAURI_SIGNING_PRIVATE_KEY: "${{ secrets.TAURI_PRIVATE_KEY }}"
@@ -60,11 +60,11 @@ jobs:
       ### LINUX
 
       - name: linux > build
-        run: make TAURI_SIGNING_PRIVATE_KEY="${{ secrets.TAURI_PRIVATE_KEY }}" TAURI_SIGNING_PRIVATE_KEY_PASSWORD="${{ secrets.TAURI_KEY_PASSWORD }}" DOCKER_USERID=1001 build_docker_tauri
-        if: matrix.platform == 'ubuntu-latest'
+        run: make TAURI_SIGNING_PRIVATE_KEY="${{ secrets.TAURI_PRIVATE_KEY }}" TAURI_SIGNING_PRIVATE_KEY_PASSWORD="${{ secrets.TAURI_KEY_PASSWORD }}" build_docker_tauri
+        if: matrix.platform == 'ubuntu-24.04'
 
       - name: linux > upload artifacts
-        if: matrix.platform == 'ubuntu-latest'
+        if: matrix.platform == 'ubuntu-24.04'
         uses: actions/upload-artifact@v4
         with:
           name: linux_artifacts
@@ -141,12 +141,12 @@ jobs:
 
   build_browser_extensions:
     name: Build browser extensions
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-24.04
     steps:
       - uses: actions/checkout@v4
 
       - name: build extensions
-        run: make DOCKER_USERID=1001 build_browser_extensions
+        run: make build_browser_extensions
 
       - name: upload artifacts
         uses: actions/upload-artifact@v4
@@ -159,7 +159,7 @@ jobs:
 
   build_docker:
     name: Build docker images
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-24.04
     steps:
       - uses: actions/checkout@v4
 
@@ -195,7 +195,7 @@ jobs:
       - build_desktop
       - build_docker
       - build_browser_extensions
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-24.04
     steps:
       - uses: actions/checkout@v4
       - uses: martinbeentjes/[email protected]

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,13 @@
 # Changelog
 
+## 1.4.0
+
+* for elasticsearch 7 and 8, query both `_template` and `_index_template` endpoints, fixes [#281](https://github.com/cars10/elasticvue/issues/281)
+* improve shards view
+* fix issue when multiple indices are selected and one is manually deleted
+* add shard recovery view, fixes [#272](https://github.com/cars10/elasticvue/issues/272)
+* adds chip indicating filtered tables. This should fix issues with users not noticing that the filter is still present.
+
 ## 1.3.1
 
 Change the build process for the linux desktop app. It now requires glibc `3.35`, so it should run distros using 

diff --git a/Makefile b/Makefile
@@ -1,7 +1,7 @@
 CI ?=
 TAURI_SIGNING_PRIVATE_KEY ?=
 TAURI_SIGNING_PRIVATE_KEY_PASSWORD ?=
-DOCKER_USERID ?= 1000
+UID := $(shell id -u)
 
 build_docker_ci:
 	docker build -f docker/Dockerfile_ci -t elasticvue-ci .
@@ -13,7 +13,7 @@ build_tauri:
 	yarn tauri:build
 
 build_docker_tauri:
-	docker build -t elasticvue-linux-tauri -f docker/Dockerfile_tauri --build-arg USERID="$(DOCKER_USERID)" .
+	docker build -t elasticvue-linux-tauri -f docker/Dockerfile_tauri --build-arg USERID="$(UID)" .
 	docker run --rm -e TAURI_SIGNING_PRIVATE_KEY="$(TAURI_SIGNING_PRIVATE_KEY)" \
 	                -e TAURI_SIGNING_PRIVATE_KEY_PASSWORD="$(TAURI_SIGNING_PRIVATE_KEY_PASSWORD)" \
 	                -v .:/app \
@@ -30,7 +30,7 @@ build_docker_nginx_multiarch:
 # Build elasticvue browser extensions into ./artifacts via docker
 build_browser_extensions:
 	mkdir -p "$(CURDIR)/artifacts"
-	docker build -f docker/Dockerfile_browser_ext -t elasticvue-build_browser_ext --build-arg USERID="$(DOCKER_USERID)" .
+	docker build -f docker/Dockerfile_browser_ext -t elasticvue-build_browser_ext --build-arg USERID="$(UID)" .
 	docker run --rm -v "$(CURDIR)/artifacts":/app/artifacts elasticvue-build_browser_ext scripts/build_browser_extensions.sh
 
 run_docker_nginx:

diff --git a/README.md b/README.md
@@ -13,7 +13,7 @@ Elasticsearch gui for your browser [https://elasticvue.com](https://elasticvue.c
 
 > Elasticsearch is a trademark of Elasticsearch BV, registered in the U.S. and in other countries.
 
-[![Demo](http://static.cars10k.de/demo.gif)](http://static.cars10k.de/demo.gif)
+[![Demo](http://static.cars10k.de/demo.gif)](http://static.cars10k.de/demo.gif?v=2)
 
 Contents
 
@@ -178,7 +178,8 @@ See the Wiki. [Comparing to other frontends](https://github.com/cars10/elasticvu
 Elasticvue is available in the following languages:
 
 * english
-* chinese (about 80% translated)
+* chinese 
+* french
 
 ### Help wanted
 

diff --git a/browser_extension/chrome/manifest.json b/browser_extension/chrome/manifest.json
@@ -1,6 +1,6 @@
 {
   "name": "Elasticvue",
-  "version": "1.3.1",
+  "version": "1.4.0",
   "description": "Elasticsearch frontend",
   "manifest_version": 3,
   "icons": {

diff --git a/browser_extension/firefox/manifest.json b/browser_extension/firefox/manifest.json
@@ -1,6 +1,6 @@
 {
   "name": "Elasticvue",
-  "version": "1.3.1",
+  "version": "1.4.0",
   "description": "Elasticsearch frontend",
   "manifest_version": 2,
   "icons": {

diff --git a/docker/Dockerfile_browser_ext b/docker/Dockerfile_browser_ext
@@ -1,27 +1,28 @@
 FROM node:22.5.1-bookworm
 ARG USERID=1000
+ENV APP_HOME=/app
+
+RUN if ! id -u $USERID > /dev/null 2>&1; then useradd --uid $USERID -m dev; fi
+
+RUN mkdir -p $APP_HOME
 
 RUN apt-get update -qq \
-        && apt-get upgrade -y \
-        && apt-get install -y \
-            zip \
+        && apt-get install -y zip \
         && apt-get clean \
         && apt-get autoclean \
         && apt-get autoremove -y \
         && rm -rf /var/lib/apt/lists/*
 
-RUN mkdir /app
-WORKDIR /app
+WORKDIR $APP_HOME
 
 RUN npm install --global web-ext
 
-COPY package.json .
-COPY yarn.lock .
+COPY . .
 
 RUN yarn install
-COPY . .
 
-RUN chown -R $USERID:$USERID /app
+RUN chown -R $USERID:$USERID $APP_HOME
+
 USER $USERID
 
-ENTRYPOINT ["/bin/bash"]
+ENTRYPOINT ["/bin/bash"]
diff --git a/docker/Dockerfile_tauri b/docker/Dockerfile_tauri
@@ -3,9 +3,8 @@ ARG USERID=1000
 
 ENV NODE_VERSION=22
 ENV APP_HOME=/app
-ENV BUILD_USER=tauri
 
-RUN useradd --uid $USERID -m $BUILD_USER
+RUN useradd --uid $USERID -m dev
 RUN mkdir -p $APP_HOME
 RUN chown -R $USERID:$USERID $APP_HOME
 
@@ -18,7 +17,7 @@ RUN apt-get update && \
     && apt-get autoremove -y \
     && rm -rf /var/lib/apt/lists/*
 
-USER $BUILD_USER
+USER $USERID
 
 RUN curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- --default-toolchain stable -y
 
@@ -67,4 +66,4 @@ RUN apt-get update \
     && apt-get autoremove -y \
     && rm -rf /var/lib/apt/lists/*
 
-USER $BUILD_USER
+USER $USERID
diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "elasticvue",
   "private": true,
-  "version": "1.3.1",
+  "version": "1.4.0",
   "scripts": {
     "dev": "vite",
     "build": "vite build",
@@ -38,14 +38,14 @@
     "pretty-bytes": "^6.1.1",
     "quasar": "^2.17.6",
     "vue": "^3.5.13",
-    "vue-i18n": "^10.0.5",
+    "vue-i18n": "^11.0.1",
     "vue-resizable": "^2.1.7",
     "vue-router": "^4.5.0"
   },
   "devDependencies": {
-    "@intlify/eslint-plugin-vue-i18n": "^3.1.0",
+    "@intlify/eslint-plugin-vue-i18n": "^3.2.0",
     "@playwright/test": "^1.49.1",
-    "@quasar/vite-plugin": "^1.8.1",
+    "@quasar/vite-plugin": "^1.9.0",
     "@tauri-apps/cli": "^2.2.4",
     "@types/json-bigint": "^1.0.4",
     "@vitejs/plugin-vue": "^5.2.1",
@@ -55,10 +55,10 @@
     "eslint": "^9.18.0",
     "eslint-plugin-vue": "^9.32.0",
     "sass": "^1.83.4",
-    "typescript": "5.6.3",
+    "typescript": "5.7.3",
     "vite": "^6.0.7",
     "vite-bundle-visualizer": "^1.2.1",
-    "vitest": "^2.1.8",
+    "vitest": "^3.0.2",
     "vue-tsc": "^2.2.0"
   }
 }
diff --git a/src-tauri/gen/schemas/acl-manifests.json b/src-tauri/gen/schemas/acl-manifests.json
diff --git a/src-tauri/gen/schemas/desktop-schema.json b/src-tauri/gen/schemas/desktop-schema.json
@@ -2413,6 +2413,11 @@
           "type": "string",
           "const": "core:webview:allow-reparent"
         },
+        {
+          "description": "Enables the set_webview_background_color command without any pre-configured scope.",
+          "type": "string",
+          "const": "core:webview:allow-set-webview-background-color"
+        },
         {
           "description": "Enables the set_webview_focus command without any pre-configured scope.",
           "type": "string",
@@ -2493,6 +2498,11 @@
           "type": "string",
           "const": "core:webview:deny-reparent"
         },
+        {
+          "description": "Denies the set_webview_background_color command without any pre-configured scope.",
+          "type": "string",
+          "const": "core:webview:deny-set-webview-background-color"
+        },
         {
           "description": "Denies the set_webview_focus command without any pre-configured scope.",
           "type": "string",
@@ -2708,6 +2718,21 @@
           "type": "string",
           "const": "core:window:allow-set-always-on-top"
         },
+        {
+          "description": "Enables the set_background_color command without any pre-configured scope.",
+          "type": "string",
+          "const": "core:window:allow-set-background-color"
+        },
+        {
+          "description": "Enables the set_badge_count command without any pre-configured scope.",
+          "type": "string",
+          "const": "core:window:allow-set-badge-count"
+        },
+        {
+          "description": "Enables the set_badge_label command without any pre-configured scope.",
+          "type": "string",
+          "const": "core:window:allow-set-badge-label"
+        },
         {
           "description": "Enables the set_closable command without any pre-configured scope.",
           "type": "string",
@@ -2793,6 +2818,11 @@
           "type": "string",
           "const": "core:window:allow-set-minimizable"
         },
+        {
+          "description": "Enables the set_overlay_icon command without any pre-configured scope.",
+          "type": "string",
+          "const": "core:window:allow-set-overlay-icon"
+        },
         {
           "description": "Enables the set_position command without any pre-configured scope.",
           "type": "string",
@@ -3053,6 +3083,21 @@
           "type": "string",
           "const": "core:window:deny-set-always-on-top"
         },
+        {
+          "description": "Denies the set_background_color command without any pre-configured scope.",
+          "type": "string",
+          "const": "core:window:deny-set-background-color"
+        },
+        {
+          "description": "Denies the set_badge_count command without any pre-configured scope.",
+          "type": "string",
+          "const": "core:window:deny-set-badge-count"
+        },
+        {
+          "description": "Denies the set_badge_label command without any pre-configured scope.",
+          "type": "string",
+          "const": "core:window:deny-set-badge-label"
+        },
         {
           "description": "Denies the set_closable command without any pre-configured scope.",
           "type": "string",
@@ -3138,6 +3183,11 @@
           "type": "string",
           "const": "core:window:deny-set-minimizable"
         },
+        {
+          "description": "Denies the set_overlay_icon command without any pre-configured scope.",
+          "type": "string",
+          "const": "core:window:deny-set-overlay-icon"
+        },
         {
           "description": "Denies the set_position command without any pre-configured scope.",
           "type": "string",