Skip to content

Commit

Permalink
automatic merge to finish v1.0.6
Browse files Browse the repository at this point in the history
  • Loading branch information
cars10 committed Apr 23, 2024
2 parents 248a722 + 29e9566 commit cfc3ff9
Show file tree
Hide file tree
Showing 20 changed files with 23 additions and 25 deletions.
4 changes: 4 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
# Changelog

## 1.0.6

* double click to edit search results, fixes [#225](https://github.com/cars10/elasticvue/issues/225)

## 1.0.5

* adds request logging to desktop app
Expand Down
2 changes: 1 addition & 1 deletion browser_extension/chrome/manifest.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "Elasticvue",
"version": "1.0.5",
"version": "1.0.6",
"description": "Elasticsearch frontend",
"manifest_version": 3,
"icons": {
Expand Down
2 changes: 1 addition & 1 deletion browser_extension/firefox/manifest.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "Elasticvue",
"version": "1.0.5",
"version": "1.0.6",
"description": "Elasticsearch frontend",
"manifest_version": 2,
"icons": {
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "elasticvue",
"private": true,
"version": "1.0.5",
"version": "1.0.6",
"scripts": {
"dev": "vite",
"build": "vite build",
Expand Down
2 changes: 1 addition & 1 deletion src-tauri/tauri.conf.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"package": {
"productName": "elasticvue",
"version": "1.0.5"
"version": "1.0.6"
},
"build": {
"distDir": "../dist",
Expand Down
2 changes: 1 addition & 1 deletion src/components/clusterselection/EditCluster.vue
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
:title="t('cluster_selection.edit_cluster.edit.title')"
@click.stop="dialog = true" />

<q-dialog v-model="dialog">
<q-dialog v-model="dialog" transition-duration="100">
<q-card style="min-width: 800px">
<q-card-section class="flex justify-between">
<h2 class="text-h6 q-my-none">
Expand Down
2 changes: 1 addition & 1 deletion src/components/clusterselection/NewCluster.vue
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<template>
<q-btn :label="t('cluster_selection.new_cluster.add_cluster')" color="primary-dark" @click="dialog = true" />

<q-dialog v-model="dialog">
<q-dialog v-model="dialog" transition-duration="100">
<q-card style="min-width: 800px">
<q-card-section class="flex justify-between">
<h2 class="text-h6 q-my-none">{{ t('cluster_selection.new_cluster.heading') }}</h2>
Expand Down
2 changes: 1 addition & 1 deletion src/components/indices/IndexAliases.vue
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
</q-item-section>
</q-item>

<q-dialog v-model="dialog">
<q-dialog v-model="dialog" transition-duration="100">
<q-card style="width: 600px; max-width: 80vw;">
<q-card-section class="flex justify-between">
<div class="flex">
Expand Down
2 changes: 1 addition & 1 deletion src/components/indices/IndexReindex.vue
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
</q-item-section>
</q-item>

<q-dialog v-model="dialog">
<q-dialog v-model="dialog" transition-duration="100">
<q-card style="width: 600px; max-width: 80vw;">
<q-card-section class="flex justify-between">
<div class="flex">
Expand Down
2 changes: 1 addition & 1 deletion src/components/indices/NewIndex.vue
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<template>
<q-btn id="new_index" color="primary-dark" :label="t('indices.new_index.heading')" @click="dialog = true" />

<q-dialog v-model="dialog" @hide="resetForm">
<q-dialog v-model="dialog" transition-duration="100" @hide="resetForm">
<q-card style="width: 500px">
<q-card-section class="flex justify-between">
<h2 class="text-h6 q-my-none">
Expand Down
2 changes: 1 addition & 1 deletion src/components/repositories/NewSnapshotRepository.vue
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<template>
<q-btn color="primary-dark" :label="t('repositories.new_repository.heading')" @click="dialog = true" />

<q-dialog v-model="dialog" @hide="hide">
<q-dialog v-model="dialog" transition-duration="100" @hide="hide">
<q-card style="width: 500px">
<q-card-section class="flex justify-between">
<h2 class="text-h6 q-my-none">
Expand Down
2 changes: 1 addition & 1 deletion src/components/rest/RestQueryExamples.vue
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<q-btn :label="t('query.rest_query_examples.heading')" icon="info" color="dark-grey" class="q-mb-sm"
@click="dialog = true" />

<q-dialog v-model="dialog">
<q-dialog v-model="dialog" transition-duration="100">
<q-card style="min-width: 900px; max-width: 1600px;">
<q-card-section class="flex justify-between">
<div class="flex">
Expand Down
2 changes: 1 addition & 1 deletion src/components/search/EditDocument.vue
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<template>
<q-dialog v-model="ownValue" @show="triggerResize">
<q-dialog v-model="ownValue" transition-duration="100" @show="triggerResize">
<q-card style="width: 1000px; max-width: 1000px;">
<q-card-section class="flex justify-between">
<div class="flex">
Expand Down
6 changes: 2 additions & 4 deletions src/components/search/SearchResult.vue
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<template>
<tr>
<tr class="clickable" title="Double click to edit" @dblclick="edit = true">
<td>
<slot name="checkbox" />
</td>
Expand All @@ -8,10 +8,9 @@
<template v-else>{{ renderValue(doc, column) }}</template>
</td>
<td>
<edit-document v-model="edit" :_id="doc._id" :_index="doc._index" :_type="doc._type" :_routing="doc._routing" />
<div v-intersection="onIntersection" class="inline-block" style="min-width: 134px">
<edit-document v-model="edit" :_id="doc._id" :_index="doc._index" :_type="doc._type" :_routing="doc._routing" />
<q-btn-group v-if="buttonsVisible">
<q-btn icon="info" color="dark-grey" @click="showDocument" />
<q-btn icon="edit" color="dark-grey" @click="edit = true" />
<q-btn icon="delete" color="dark-grey" @click="deleteDocument" />
</q-btn-group>
Expand All @@ -31,7 +30,6 @@
const {
resultColumns,
edit,
showDocument,
deleteDocument,
renderValue,
buttonsVisible,
Expand Down
2 changes: 1 addition & 1 deletion src/components/setup/SetupInstance.vue
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<template>
<q-btn id="add_cluster" color="primary-dark" icon="add" :label="t('setup.setup_instance.heading')" @click="dialog = true" />

<q-dialog v-model="dialog" position="top" transition-show="scale" transition-hide="scale">
<q-dialog v-model="dialog" position="top" transition-show="scale" transition-hide="scale" transition-duration="100">
<q-card style="width: 1000px;max-width: 1000px" class="q-mt-xl">
<q-card-section class="flex justify-between">
<h2 class="text-h5 q-my-none">{{ t('setup.setup_instance.heading') }}</h2>
Expand Down
2 changes: 1 addition & 1 deletion src/components/snapshots/NewSnapshot.vue
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<template>
<q-btn color="primary-dark" :label="t('snapshots.new_snapshot.heading')" @click="dialog = true" />

<q-dialog v-model="dialog" @hide="resetForm">
<q-dialog v-model="dialog" transition-duration="100" @hide="resetForm">
<q-card style="width: 500px">
<q-card-section class="flex justify-between">
<h2 class="text-h6 q-my-none">
Expand Down
2 changes: 1 addition & 1 deletion src/components/snapshots/RestoreSnapshot.vue
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<template>
<q-btn color="dark-grey" icon="restore" @click="dialog = true" />

<q-dialog v-model="dialog" @hide="resetForm">
<q-dialog v-model="dialog" transition-duration="100" @hide="resetForm">
<q-card style="width: 500px">
<q-card-section class="flex justify-between">
<h2 class="text-h6 q-my-none">
Expand Down
2 changes: 1 addition & 1 deletion src/components/welcome/ImportBackup.vue
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<template>
<q-btn color="primary-dark" :label="t('welcome.import_backup.heading')" icon="upload" @click="dialog = true" />

<q-dialog v-model="dialog" position="top" transition-show="scale" transition-hide="scale">
<q-dialog v-model="dialog" position="top" transition-show="scale" transition-hide="scale" transition-duration="100">
<q-card style="width: 500px" class="q-mt-xl">
<q-card-section class="flex justify-between">
<h2 class="text-h5 q-my-none">{{ t('welcome.import_backup.heading') }}</h2>
Expand Down
2 changes: 1 addition & 1 deletion src/composables/components/search/EditDocument.ts
Original file line number Diff line number Diff line change
Expand Up @@ -48,8 +48,8 @@ export const useEditDocument = (props: EditDocumentProps, emit: any) => {

watch(ownValue, value => (emit('update:modelValue', value)))
watch(() => props.modelValue, value => {
ownValue.value = value
if (value) loadDocument()
ownValue.value = value
})

const loadDocument = async () => {
Expand Down
4 changes: 0 additions & 4 deletions src/composables/components/search/SearchResult.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
import { useTranslation } from '../../i18n.ts'
import { useSearchStore } from '../../../store/search.ts'
import { computed, ref } from 'vue'
import { useModal } from '../../Modal.ts'
import { defineElasticsearchRequest } from '../../CallElasticsearch.ts'
import { stringifyJson } from '../../../helpers/json/stringify.ts'

Expand All @@ -20,8 +19,6 @@ export const useSearchResult = (props: SearchResultProps, emit: any) => {
id: props.doc._id,
routing: props.doc._routing
})
const { openModalWith } = useModal()
const showDocument = () => (openModalWith('get', docInfo()))

const { run } = defineElasticsearchRequest({ emit, method: 'delete' })
const deleteDocument = async () => {
Expand Down Expand Up @@ -57,7 +54,6 @@ export const useSearchResult = (props: SearchResultProps, emit: any) => {
return {
resultColumns,
edit,
showDocument,
deleteDocument,
renderValue,
buttonsVisible,
Expand Down

0 comments on commit cfc3ff9

Please sign in to comment.