automatic merge to finish v1.0.1

cars10 · Dec 31, 2023 · 5d1570c · 5d1570c
2 parents f64a5ba + d38e609
commit 5d1570c
Show file tree

Hide file tree

Showing 56 changed files with 1,282 additions and 738 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -96,7 +96,7 @@ jobs:
       - uses: actions/checkout@v3
       - run: make build_browser_extensions
 
-      - name: upload chrome extension
+      - name: upload extensions
         uses: actions/upload-artifact@v3
         with:
           path: artifacts/*.zip

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,23 @@
 # Changelog
 
+## 1.0.1
+
+This release fixes some bugs that where introduced in `1.0`. It also adds the ability to configure clusters when using
+elasticvue via docker.
+
+* you can add predefined clusters when starting elasticvue via docker, check the readme for details. fixes [#112][i112]
+* fix issues when showing documents if `routing` is enabled, fixes [#177][i177]
+* fix issue when trying to show all shards, fixes [#174][i174]
+* fix issue with jumping cursor in rest editor, fixes [#180][i180]
+
+[i112]: https://github.com/cars10/elasticvue/issues/112
+
+[i177]: https://github.com/cars10/elasticvue/issues/177
+
+[i174]: https://github.com/cars10/elasticvue/issues/174
+
+[i180]: https://github.com/cars10/elasticvue/issues/180
+
 ## 1.0.0
 
 This is the first stable release of elasticvue `1.0`. Elasticvue now uses vue 3, vite, quasar and typescript.
@@ -19,7 +37,7 @@ Older versions of elasticsearch should work, but you might encounter small bugs
 * Browser extension (no cluster configuration required)
     * [Google chrome](https://chrome.google.com/webstore/detail/elasticvue/hkedbapjpblbodpgbajblpnlpenaebaa)
     * [Firefox](https://addons.mozilla.org/en-US/firefox/addon/elasticvue/)
-    * [Microsoft edge](https://microsoftedge.microsoft.com/addons/detail/geifniocjfnfilcbeloeidajlfmhdlgo)
+    * [Microsoft Edge](https://microsoftedge.microsoft.com/addons/detail/geifniocjfnfilcbeloeidajlfmhdlgo)
 * [Docker](https://hub.docker.com/r/cars10/elasticvue) (cluster configuration **required**)
 * [Web version](https://app.elasticvue.com/) (cluster configuration **required**)
 * [Building manually](https://github.com/cars10/elasticvue/wiki/Building-Elasticvue) (cluster configuration

diff --git a/Makefile b/Makefile
@@ -24,7 +24,7 @@ build_docker_nginx_multiarch:
 build_browser_extensions:
 	mkdir -p "$(CURDIR)/artifacts"
 	docker build -f docker/Dockerfile_browser_ext -t elasticvue-build_browser_ext .
-	docker run --rm -v "$(CURDIR)/artifacts":/app/artifacts --user 1000 elasticvue-build_browser_ext scripts/build_browser_extensions.sh
+	docker run --rm -v "$(CURDIR)/artifacts":/app/artifacts elasticvue-build_browser_ext scripts/build_browser_extensions.sh
 
 run_docker_nginx:
 	docker run -p 8080:8080 elasticvue
diff --git a/README.md b/README.md
@@ -74,6 +74,47 @@ Use the [existing image](https://hub.docker.com/r/cars10/elasticvue):
 docker run -p 8080:8080 --name elasticvue -d cars10/elasticvue
 ```
 
+When using docker you can provide some default cluster configuration for your users. You can either set an environment
+variable or provide a config file as a volume. In either case the content should be a json array of your
+clusters, looking like this:
+
+```json
+[
+  {
+    "name": "dev cluster",
+    "uri": "http://localhost:9200"
+  },
+  {
+    "name": "prod cluster",
+    "uri": "http://localhost:9501",
+    "username": "elastic",
+    "password": "foobar"
+  }
+]
+```
+
+The keys `name` and `uri` are required, `username` and `password` are optional. If you want to connect with an api key
+simply use that as the password and omit the username.
+
+#### Docker with default clusters in environment variable
+
+Example using environment variable `ELASTICVUE_CLUSTERS`:
+
+```bash
+docker run -p 8080:8080 -e ELASTICVUE_CLUSTERS='[{"name": "prod cluster", "uri": "http://localhost:9200", "username": "elastic", "password": "elastic"}]' cars10/elasticvue
+```
+
+#### Docker with default clusters in config file via volume
+
+Example using config file volume to `/usr/share/nginx/html/api/default_clusters.json`:
+
+```bash
+echo '[{"name": "prod cluster", "uri": "http://localhost:9200", "username": "elastic", "password": "elastic"}]' > /config.json
+docker run -p 8080:8080 -v /config.json:/usr/share/nginx/html/api/default_clusters.json cars10/elasticvue
+```
+
+Your users will be prompted to optionally import these clusters.
+
 ### Web version
 
 *You have to configure your elasticsearch cluster if you use the web version of elasticvue*  

diff --git a/browser_extension/chrome/manifest.json b/browser_extension/chrome/manifest.json
@@ -1,6 +1,6 @@
 {
   "name": "Elasticvue",
-  "version": "1.0.0",
+  "version": "1.0.1",
   "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.0.0",
+  "version": "1.0.1",
   "description": "Elasticsearch frontend",
   "manifest_version": 2,
   "icons": {

diff --git a/docker/Dockerfile b/docker/Dockerfile
@@ -7,9 +7,10 @@ COPY yarn.lock .
 
 RUN yarn install
 COPY . .
-RUN VITE_APP_BUILD_MODE=web yarn build
+RUN VITE_APP_BUILD_MODE=docker yarn build
 
 FROM nginx:mainline-alpine
 COPY --from=builder /app/dist /usr/share/nginx/html
 RUN rm /etc/nginx/conf.d/default.conf
 COPY docker/nginx/elasticvue.conf /etc/nginx/conf.d/
+COPY docker/nginx/99_default_clusters.sh /docker-entrypoint.d
diff --git a/docker/Dockerfile_multiarch b/docker/Dockerfile_multiarch
@@ -7,9 +7,10 @@ COPY yarn.lock .
 
 RUN yarn install
 COPY . .
-RUN VITE_APP_BUILD_MODE=web yarn build
+RUN VITE_APP_BUILD_MODE=docker yarn build
 
 FROM nginx:mainline-alpine
 COPY --from=builder /app/dist /usr/share/nginx/html
 RUN rm /etc/nginx/conf.d/default.conf
 COPY docker/nginx/elasticvue.conf /etc/nginx/conf.d/
+COPY docker/nginx/99_default_clusters.sh /docker-entrypoint.d
diff --git a/docker/nginx/99_default_clusters.sh b/docker/nginx/99_default_clusters.sh
@@ -0,0 +1,10 @@
+#!/bin/sh
+
+CONFIG_FILE_DIR=/usr/share/nginx/html/api
+CONFIG_FILE_PATH=$CONFIG_FILE_DIR/default_clusters.json
+
+if [ ! -f $CONFIG_FILE_PATH ] && [ -n "$ELASTICVUE_CLUSTERS" ]; then
+  echo "> found ELASTICVUE_CLUSTERS..."
+  mkdir $CONFIG_FILE_DIR
+  echo "$ELASTICVUE_CLUSTERS" > $CONFIG_FILE_PATH
+fi
diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "elasticvue",
   "private": true,
-  "version": "1.0.0",
+  "version": "1.0.1",
   "scripts": {
     "dev": "vite",
     "build": "vite build",
@@ -28,7 +28,7 @@
     "pinia-plugin-persistedstate": "^3.2.1",
     "pretty-bytes": "^6.1.1",
     "quasar": "^2.14.2",
-    "vue": "^3.3.13",
+    "vue": "^3.4.3",
     "vue-i18n": "^9.8.0",
     "vue-resizable": "^2.1.7",
     "vue-router": "^4.2.5"
@@ -38,16 +38,16 @@
     "@quasar/vite-plugin": "^1.6.0",
     "@tauri-apps/cli": "^1.5.9",
     "@types/json-bigint": "^1.0.4",
-    "@vitejs/plugin-vue": "^4.5.2",
+    "@vitejs/plugin-vue": "^5.0.2",
     "@vue/eslint-config-typescript": "^12.0.0",
     "@vue/tsconfig": "^0.5.1",
     "eslint": "^8.56.0",
     "eslint-plugin-vue": "^9.19.2",
-    "sass": "^1.69.5",
+    "sass": "^1.69.6",
     "typescript": "^5.3.3",
     "vite": "^5.0.10",
     "vite-bundle-visualizer": "^1.0.0",
     "vitest": "^1.1.0",
-    "vue-tsc": "^1.8.26"
+    "vue-tsc": "^1.8.27"
   }
 }
diff --git a/scripts/release.sh b/scripts/release.sh
@@ -12,8 +12,9 @@ sed -e "s/\"version\":\s\".*\"/\"version\": \"$VERSION\"/" -i browser_extension/
 
 # commit new version
 git add package.json
-git add browser_extension/chrome/manifest.json
-git add browser_extension/firefox/manifest.json
+git add src-tauri/tauri.conf.json
+git add -f browser_extension/chrome/manifest.json
+git add -f browser_extension/firefox/manifest.json
 git commit -am "bumps version to $VERSION"
 
 git push

diff --git a/src-tauri/tauri.conf.json b/src-tauri/tauri.conf.json
@@ -1,7 +1,7 @@
 {
   "package": {
     "productName": "elasticvue",
-    "version": "1.0.0"
+    "version": "1.0.1"
   },
   "build": {
     "distDir": "../dist",

diff --git a/src/assets/stylesheets/quasar/q-banner.css b/src/assets/stylesheets/quasar/q-banner.css
@@ -1,7 +1,8 @@
 .q-banner {
-  border-radius: 2px;
-  font-size: 16px !important;
+    border-radius: 2px;
+    font-size: 16px !important;
 }
+
 .q-banner .text-body2 {
-  font-size: 16px !important;
+    font-size: 16px !important;
 }
diff --git a/src/assets/stylesheets/quasar/q-btn.css b/src/assets/stylesheets/quasar/q-btn.css
@@ -1,7 +1,7 @@
 .q-btn {
-  font-weight: initial !important;
+    font-weight: initial !important;
 }
 
 .q-btn-group .q-btn:first-child {
-  border-right: 2px solid var(--theme-menu-separator-background);
+    border-right: 2px solid var(--theme-menu-separator-background);
 }
diff --git a/src/assets/stylesheets/quasar/q-card.css b/src/assets/stylesheets/quasar/q-card.css
@@ -1,9 +1,9 @@
 .q-card {
-  color: var(--theme-color);
-  background: var(--theme-background);
+    color: var(--theme-color);
+    background: var(--theme-background);
 }
 
 .q-table__card {
-  color: var(--theme-color);
-  background: inherit;
+    color: var(--theme-color);
+    background: inherit;
 }
diff --git a/src/assets/stylesheets/quasar/q-form.css b/src/assets/stylesheets/quasar/q-form.css
@@ -1,48 +1,57 @@
 .q-field__control {
-  color: var(--theme-primary);
+    color: var(--theme-primary);
+}
+
+.q-field--small .q-field__control, .q-field--small .q-field__marginal {
+    height: initial;
+}
+
+.q-field--small .q-field__native {
+    padding: 3px 0;
+    font-size: 14px;
 }
 
 .q-field__marginal {
-  color: var(--theme-muted-color);
+    color: var(--theme-muted-color);
 }
 
 .q-field__native {
-  color: var(--theme-color);
+    color: var(--theme-color);
 }
 
 .q-field__label {
-  color: var(--theme-muted-color);
+    color: var(--theme-muted-color);
 }
 
 .q-field__control:before {
-  border-color: var(--theme-muted-color) !important;
+    border-color: var(--theme-muted-color) !important;
 }
 
 .q-field.q-field--standard:hover .q-field__control:before {
-  border-color: var(--theme-dark-grey-color);
+    border-color: var(--theme-dark-grey-color);
 }
 
 .q-field.q-field--standard.q-field--highlighted .q-field__label {
-  color: var(--theme-primary) !important;
+    color: var(--theme-primary) !important;
 }
 
 .q-field__bottom {
-  color: var(--theme-muted-color) !important;
-  padding: 2px 0 0 0;
+    color: var(--theme-muted-color) !important;
+    padding: 2px 0 0 0;
 }
 
 .q-checkbox__inner--falsy .q-checkbox__bg {
-  border-color: var(--theme-muted-color);
+    border-color: var(--theme-muted-color);
 }
 
 .q-input {
-  font-size: 16px !important;
+    font-size: 16px !important;
 }
 
 .q-field__input {
-  color: var(--theme-color);
+    color: var(--theme-color);
 }
 
 .q-radio__inner {
-  color: var(--theme-muted-color);
+    color: var(--theme-muted-color);
 }
diff --git a/src/assets/stylesheets/quasar/q-list.css b/src/assets/stylesheets/quasar/q-list.css
@@ -1,4 +1,4 @@
 .q-item__label--header {
-  color: var(--theme-color);
-  font-weight: 500;
+    color: var(--theme-color);
+    font-weight: 500;
 }
diff --git a/src/assets/stylesheets/quasar/q-menu.css b/src/assets/stylesheets/quasar/q-menu.css
@@ -1,16 +1,16 @@
 .q-menu {
-  background: var(--theme-menu-background);
-  border: 1px solid var(--theme-background);
+    background: var(--theme-menu-background);
+    border: 1px solid var(--theme-background);
 }
 
 .q-menu .q-separator {
-  background: var(--theme-menu-separator-background);
+    background: var(--theme-menu-separator-background);
 }
 
 .q-dialog .q-card {
-  background: var(--theme-card-background);
+    background: var(--theme-card-background);
 }
 
 .q-dialog .q-card .q-separator {
-  background: var(--theme-menu-separator-background);
+    background: var(--theme-menu-separator-background);
 }
diff --git a/src/assets/stylesheets/quasar/q-separator.css b/src/assets/stylesheets/quasar/q-separator.css
@@ -1,3 +1,3 @@
 .q-separator {
-  background: var(--theme-separator-background);
+    background: var(--theme-separator-background);
 }
diff --git a/src/assets/stylesheets/quasar/q-tab.css b/src/assets/stylesheets/quasar/q-tab.css
@@ -1,11 +1,11 @@
 .q-tab-panels {
-  background-color: initial;
+    background-color: initial;
 }
 
 .q-tab, .q-tab__content, .q-tab__label {
-  transition: none !important;
+    transition: none !important;
 }
 
 .q-tab__indicator {
-  transition: none !important;
+    transition: none !important;
 }