Browse Source

fix(gui): hide add filter group in webhook and loading filters if new webhook

Signed-off-by: Pranav C <pranavxc@gmail.com>
pull/3709/head
Pranav C 2 years ago
parent
commit
d47bbd4c0b
  1. 9
      packages/nc-gui/components/smartsheet-toolbar/ColumnFilter.vue
  2. 1
      packages/nc-gui/components/webhook/Editor.vue

9
packages/nc-gui/components/smartsheet-toolbar/ColumnFilter.vue

@ -23,9 +23,10 @@ interface Props {
hookId?: string hookId?: string
showLoading?: boolean showLoading?: boolean
modelValue?: Filter[] modelValue?: Filter[]
webHook?: boolean
} }
const { nested = false, parentId, autoSave = true, hookId = null, modelValue, showLoading = true } = defineProps<Props>() const { nested = false, parentId, autoSave = true, hookId = null, modelValue, showLoading = true, webHook } = defineProps<Props>()
const emit = defineEmits(['update:filtersLength']) const emit = defineEmits(['update:filtersLength'])
@ -101,13 +102,13 @@ const types = computed(() => {
watch( watch(
() => activeView.value?.id, () => activeView.value?.id,
(n, o) => { (n, o) => {
if (n !== o) loadFilters(hookId as string) if (n !== o && (hookId || !webHook)) loadFilters(hookId as string)
}, },
{ immediate: true }, { immediate: true },
) )
watch( watch(
() => filters.value.length, () => filters.value.length ,
(length) => { (length) => {
emit('update:filtersLength', length ?? 0) emit('update:filtersLength', length ?? 0)
}, },
@ -280,7 +281,7 @@ defineExpose({
{{ $t('activity.addFilter') }} {{ $t('activity.addFilter') }}
</div> </div>
</a-button> </a-button>
<a-button class="text-capitalize !text-gray-500" @click.stop="addFilterGroup"> <a-button class="text-capitalize !text-gray-500" v-if="!webHook" @click.stop="addFilterGroup">
<div class="flex items-center gap-1"> <div class="flex items-center gap-1">
<!-- <v-icon small color="grey"> mdi-plus </v-icon> --> <!-- <v-icon small color="grey"> mdi-plus </v-icon> -->
<!-- Add Filter Group --> <!-- Add Filter Group -->

1
packages/nc-gui/components/webhook/Editor.vue

@ -619,6 +619,7 @@ onMounted(async () => {
:auto-save="false" :auto-save="false"
:show-loading="false" :show-loading="false"
:hook-id="hook.id" :hook-id="hook.id"
web-hook
/> />
</a-card> </a-card>
</a-col> </a-col>

Loading…
Cancel
Save