Skip to content

feat(group): adding group to connection panel #567

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
djgrech wants to merge 1 commit into
base: main
Choose a base branch
from
Open

feat(group): adding group to connection panel #567

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 20 additions & 1 deletion frontend/src/components/dialogs/ConnectionDialog.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ import { useThemeVars } from 'naive-ui'
import useBrowserStore from 'stores/browser.js'
import Delete from '@/components/icons/Delete.vue'
import Add from '@/components/icons/Add.vue'
import AddGroup from '@/components/icons/AddGroup.vue'
import IconButton from '@/components/common/IconButton.vue'

/**
Expand Down Expand Up @@ -300,6 +301,15 @@ const onClose = () => {
dialogStore.closeConnDialog()
}

const onNewGroupClick = () => {
dialogStore.openNewGroupDialog(newGroup)
}

function newGroup(newGroupName)
{
generalForm.value.group = newGroupName;
}

const pasteFromClipboard = async () => {
// url example:
// rediss://user:password@localhost:6789/3?dial_timeout=3&db=1&read_timeout=6s&max_retries=2
Expand Down Expand Up @@ -379,7 +389,16 @@ const pasteFromClipboard = async () => {
<n-select
v-model:value="generalForm.group"
:options="groupOptions"
:render-label="({ label, value }) => (value === '' ? $t(label) : label)" />
:render-label="({ label, value }) => (value === '' ? $t(label) : label)"
/>
<div style="margin-left:4px;">
<icon-button
:icon="AddGroup"
:stroke-width="3.5"
size="20"
t-tooltip="interface.new_group"
@click="onNewGroupClick()" />
</div>
</n-form-item-gi>
<n-form-item-gi :label="$t('dialogue.connection.addr')" :span="24" path="addr" required>
<n-input-group>
Expand Down
2 changes: 2 additions & 0 deletions frontend/src/components/dialogs/GroupDialog.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,8 @@ const onConfirm = async () => {
const { success, msg } = await connectionStore.createGroup(name)
if (success) {
$message.success(i18n.t('dialogue.handle_succ'))
if (dialogStore.newGroupCallback != null)
dialogStore.newGroupCallback(name);
} else {
$message.error(msg)
}
Expand Down
4 changes: 3 additions & 1 deletion frontend/src/stores/dialog.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ const useDialogStore = defineStore('dialog', {
connParam: null,

groupDialogVisible: false,
newGroupCallback: null,
editGroup: '',

/**
Expand Down Expand Up @@ -153,9 +154,10 @@ const useDialogStore = defineStore('dialog', {
this.connDialogVisible = true
},

openNewGroupDialog() {
openNewGroupDialog(callback = null) {
this.editGroup = ''
this.groupDialogVisible = true
this.newGroupCallback = callback;
},
closeNewGroupDialog() {
this.groupDialogVisible = false
Expand Down