Skip to content

Commit

Permalink
Views: Configuiration-actions: Add minor UI improvements
Browse files Browse the repository at this point in the history
Signed-off-by: Arturo Manzoli <[email protected]>
  • Loading branch information
ArturoManzoli committed Nov 5, 2024
1 parent edcbb67 commit f629ea6
Show file tree
Hide file tree
Showing 2 changed files with 20 additions and 14 deletions.
6 changes: 1 addition & 5 deletions src/types/widgets.ts
Original file line number Diff line number Diff line change
Expand Up @@ -395,11 +395,7 @@ export type CustomWidgetElementOptions = {
*/
lastSelected: SelectorOption
/**
* Last selected value
*/

/**
*
* Layout options
*/
layout: {
/**
Expand Down
28 changes: 19 additions & 9 deletions src/views/ConfigurationActionsView.vue
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
<p>View, manage, and create HTTP request actions.</p>
</template>
<template #content>
<div class="flex justify-center flex-col ml-2 mb-8 mt-2 w-[640px]">
<div class="flex justify-center flex-col mr-1 mb-8 mt-2 w-[640px]">
<v-data-table
:items="allSavedActionConfigs"
items-per-page="10"
Expand All @@ -23,13 +23,13 @@
<template #headers>
<tr>
<th class="text-left">
<p class="text-[16px] font-bold">Name</p>
<p class="text-[16px] ml-[40px] font-bold">Name</p>
</th>
<th class="text-center">
<p class="text-[16px] font-bold">URL</p>
</th>
<th class="text-right">
<p class="text-[16px] font-bold">Actions</p>
<p class="text-[16px] mr-[50px] font-bold">Actions</p>
</th>
</tr>
</template>
Expand All @@ -55,13 +55,15 @@
@click="openActionEditDialog(item.id)"
/>
<v-btn
v-tooltip="'Run/Test'"
variant="outlined"
class="rounded-full mx-1"
icon="mdi-play"
size="x-small"
@click="runAction(item.id)"
/>
<v-btn
v-tooltip="'Export'"
variant="outlined"
class="rounded-full mx-1 pl-[3px] pt-[1px]"
icon="mdi-export"
Expand All @@ -81,8 +83,9 @@
</tr>
</template>
<template #bottom>
<tr class="w-full">
<td colspan="3" class="text-center flex items-center justify-center h-[50px] mb-3 w-full gap-2">
<v-divider />
<tr class="flex w-full mt-2">
<td colspan="3" class="text-center flex items-center justify-center h-[50px] mb-3 w-full gap-4">
<v-btn variant="outlined" class="rounded-lg" @click="openNewActionDialog()">
<v-icon start>mdi-plus</v-icon>
New HTTP action
Expand All @@ -109,7 +112,7 @@
</template>
</BaseConfigurationView>

<v-dialog v-model="actionDialog.show" max-width="500px">
<v-dialog v-model="actionDialog.show" max-width="500px" :style="{ opacity: windowOpacity }">
<v-card class="rounded-lg" :style="interfaceStore.globalGlassMenuStyles">
<v-card-title class="text-h6 font-weight-bold py-4 text-center">{{
editMode ? 'Edit action' : 'Create new action'
Expand Down Expand Up @@ -198,7 +201,7 @@
<v-btn color="white" variant="text" @click="closeActionDialog">Cancel</v-btn>
<div class="flex gap-x-10">
<v-btn variant="text" @click="resetNewAction">Reset</v-btn>
<v-btn color="primary" :disabled="!isFormValid" variant="text" @click="saveActionConfig">
<v-btn :disabled="!isFormValid" variant="text" @click="saveActionConfig">
{{ editMode ? 'Save' : 'Create' }}
</v-btn>
</div>
Expand Down Expand Up @@ -312,7 +315,7 @@
</template>

<script setup lang="ts">
import { computed, onMounted, reactive, ref, watch } from 'vue'
import { computed, onMounted, reactive, ref } from 'vue'
import ExpansiblePanel from '@/components/ExpansiblePanel.vue'
import { openSnackbar } from '@/composables/snackbar'
Expand Down Expand Up @@ -366,6 +369,8 @@ const headerDialog = ref({
error: '',
})
const windowOpacity = ref(1)
const paramValueOptions = computed(() => {
const options = [{ title: 'Fixed (specify below)', value: 'fixed' }]
const availableInputParameters = getAllCockpitActionVariablesInfo()
Expand Down Expand Up @@ -470,6 +475,7 @@ const isValidHeaders = (headers: Record<string, string>): { isValid: boolean; er
}
const openUrlParamDialog = (): void => {
windowOpacity.value = 0
urlParamDialog.value = {
show: true,
key: '',
Expand All @@ -480,6 +486,7 @@ const openUrlParamDialog = (): void => {
const closeUrlParamDialog = (): void => {
urlParamDialog.value.show = false
windowOpacity.value = 1
}
const addUrlParameter = (): void => {
Expand All @@ -490,6 +497,7 @@ const addUrlParameter = (): void => {
}
const openJsonDialog = (): void => {
windowOpacity.value = 0
bodyDialog.value = {
show: true,
bodyText: newActionConfig.value.body,
Expand All @@ -499,6 +507,7 @@ const openJsonDialog = (): void => {
}
const closeJsonDialog = (): void => {
windowOpacity.value = 1
bodyDialog.value.show = false
}
Expand All @@ -514,6 +523,7 @@ const removeUrlParam = (key: string): void => {
}
const openHeaderDialog = (): void => {
windowOpacity.value = 0
headerDialog.value = {
show: true,
key: '',
Expand All @@ -523,6 +533,7 @@ const openHeaderDialog = (): void => {
}
const closeHeaderDialog = (): void => {
windowOpacity.value = 1
headerDialog.value.show = false
headerDialog.value.error = ''
}
Expand Down Expand Up @@ -665,7 +676,6 @@ const saveUrlParameter = (): void => {
onMounted(() => {
loadSavedActions()
console.log('🚀 ~ allSavedActionConfigs:', allSavedActionConfigs.value)
})
</script>

Expand Down

0 comments on commit f629ea6

Please sign in to comment.