Merge pull request #8479 from nocodb/nc-fix/misc-oss

Miscellaneous bug fixes
7 months ago · da186b74ab
5 changed files with 281 additions and 247 deletions
--- a/packages/nc-gui/components/smartsheet/toolbar/ColumnFilter.vue
+++ b/packages/nc-gui/components/smartsheet/toolbar/ColumnFilter.vue
@ -12,6 +12,7 @@ interface Props {
  webHook?: boolean
  draftFilter?: Partial<FilterType>
 }
+
 const props = withDefaults(defineProps<Props>(), {
  nestedLevel: 0,
  autoSave: true,
@ -21,13 +22,14 @@ const props = withDefaults(defineProps<Props>(), {
  webHook: false,
 })

-const emit = defineEmits(['update:filtersLength', 'update:draftFilter'])
+const emit = defineEmits(['update:filtersLength', 'update:draftFilter', 'update:modelValue'])

 const excludedFilterColUidt = [UITypes.QrCode, UITypes.Barcode]

 const draftFilter = useVModel(props, 'draftFilter', emit)
+const modelValue = useVModel(props, 'modelValue', emit)

-const { nestedLevel, parentId, autoSave, hookId, modelValue, showLoading, webHook } = toRefs(props)
+const { nestedLevel, parentId, autoSave, hookId, showLoading, webHook } = toRefs(props)

 const nested = computed(() => nestedLevel.value > 0)

@ -66,7 +68,7 @@ const {
  types,
 } = useViewFilters(
  activeView,
-  parentId?.value,
+  parentId,
  computed(() => autoSave.value),
  () => reloadDataHook.trigger({ shouldShowLoading: showLoading.value, offset: 0 }),
  modelValue.value || nestedFilters.value,
@ -250,7 +252,7 @@ const updateFilterValue = (value: string, filter: Filter, index: number) => {

 defineExpose({
  applyChanges,
-  parentId: parentId?.value,
+  parentId,
 })

 const scrollToBottom = () => {
@ -355,22 +357,35 @@ watch(
  },
 )

+const visibleFilters = computed(() => filters.value.filter((filter) => filter.status !== 'delete'))
+
 const isLogicalOpChangeAllowed = computed(() => {
-  return new Set(filters.value.slice(1).map((filter) => filter.logical_op)).size > 1
+  return new Set(visibleFilters.value.slice(1).map((filter) => filter.logical_op)).size > 1
 })

 // when logical operation is updated, update all the siblings with the same logical operation only if it's in locked state
 const onLogicalOpUpdate = async (filter: Filter, index: number) => {
-  if (index === 1 && filters.value.slice(2).every((siblingFilter) => siblingFilter.logical_op !== filter.logical_op)) {
+  if (index === 1 && visibleFilters.value.slice(2).every((siblingFilter) => siblingFilter.logical_op !== filter.logical_op)) {
    await Promise.all(
-      filters.value.slice(2).map(async (siblingFilter, i) => {
+      visibleFilters.value.slice(2).map(async (siblingFilter, i) => {
        siblingFilter.logical_op = filter.logical_op
        await saveOrUpdate(siblingFilter, i + 2, false, false, true)
      }),
    )
  }
-  await filterUpdateCondition(filter, index)
+  await saveOrUpdate(filter, index)
 }
+
+// watch for changes in filters and update the modelValue
+watch(
+  filters,
+  () => {
+    if (modelValue.value !== filters.value) modelValue.value = filters.value
+  },
+  {
+    immediate: true,
+  },
+)
 </script>

 <template>
@ -403,9 +418,9 @@ const onLogicalOpUpdate = async (filter: Filter, index: number) => {
                    class="min-w-20 capitalize"
                    placeholder="Group op"
                    dropdown-class-name="nc-dropdown-filter-logical-op-group"
-                    :disabled="i > 1 && !isLogicalOpChangeAllowed"
+                    :disabled="visibleFilters.indexOf(filter) > 1 && !isLogicalOpChangeAllowed"
                    @click.stop
-                    @change="saveOrUpdate(filter, i)"
+                    @change="onLogicalOpUpdate(filter, i)"
                  >
                    <a-select-option v-for="op in logicalOps" :key="op.value" :value="op.value">
                      <div class="flex items-center w-full justify-between w-full gap-2">
@ -434,7 +449,7 @@ const onLogicalOpUpdate = async (filter: Filter, index: number) => {
              </div>
              <div class="flex border-1 rounded-lg p-2 w-full" :class="nestedLevel % 2 !== 0 ? 'bg-white' : 'bg-gray-100'">
                <LazySmartsheetToolbarColumnFilter
-                  v-if="filter.id || filter.children"
+                  v-if="filter.id || filter.children || !autoSave"
                  :key="filter.id ?? i"
                  ref="localNestedFilters"
                  v-model="filter.children"
@ -456,7 +471,7 @@ const onLogicalOpUpdate = async (filter: Filter, index: number) => {
              :dropdown-match-select-width="false"
              class="h-full !min-w-20 !max-w-20 capitalize"
              hide-details
-              :disabled="filter.readOnly || (i > 1 && !isLogicalOpChangeAllowed)"
+              :disabled="filter.readOnly || (visibleFilters.indexOf(filter) > 1 && !isLogicalOpChangeAllowed)"
              dropdown-class-name="nc-dropdown-filter-logical-op"
              @change="onLogicalOpUpdate(filter, i)"
              @click.stop
--- a/packages/nc-gui/composables/useViewFilters.ts
+++ b/packages/nc-gui/composables/useViewFilters.ts
@ -12,13 +12,15 @@ import { UITypes, isSystemColumn } from 'nocodb-sdk'

 export function useViewFilters(
  view: Ref<ViewType | undefined>,
-  parentId?: string,
+  _parentId: Ref<string | null> | null | string,
  autoApply?: ComputedRef<boolean>,
  reloadData?: () => void,
  _currentFilters?: Filter[],
  isNestedRoot?: boolean,
  isWebhook?: boolean,
 ) {
+  const parentId = ref(_parentId)
+
  const currentFilters = ref(_currentFilters)

  const btLookupTypesMap = ref({})
@ -192,6 +194,16 @@ export function useViewFilters(
    }
  }

+  const placeholderGroupFilter = (): Filter => {
+    const logicalOps = new Set(filters.value.slice(1).map((filter) => filter.logical_op))
+
+    return {
+      is_group: true,
+      status: 'create',
+      logical_op: logicalOps.size === 1 ? logicalOps.values().next().value : 'and',
+    }
+  }
+
  const loadAllChildFilters = async (filters: Filter[]) => {
    // Array to store promises of child filter loading
    const promises = []
@ -230,14 +242,14 @@ export function useViewFilters(

    try {
      if (isWebhook || hookId) {
-        if (parentId) {
-          filters.value = (await $api.dbTableFilter.childrenRead(parentId)).list as Filter[]
+        if (parentId.value) {
+          filters.value = (await $api.dbTableFilter.childrenRead(parentId.value)).list as Filter[]
        } else if (hookId) {
          filters.value = (await $api.dbTableWebhookFilter.read(hookId)).list as Filter[]
        }
      } else {
-        if (parentId) {
-          filters.value = (await $api.dbTableFilter.childrenRead(parentId)).list as Filter[]
+        if (parentId.value) {
+          filters.value = (await $api.dbTableFilter.childrenRead(parentId.value)).list as Filter[]
        } else {
          filters.value = (await $api.dbTableFilter.read(view.value!.id!)).list as Filter[]
          if (loadAllFilters) {
@ -265,21 +277,25 @@ export function useViewFilters(
        } else if (filter.status === 'update') {
          await $api.dbTableFilter.update(filter.id as string, {
            ...filter,
-            fk_parent_id: parentId,
+            fk_parent_id: parentId.value,
          })
        } else if (filter.status === 'create') {
+          // extract children value if found to restore
+          const children = filters.value[+i]?.children
          if (hookId) {
            filters.value[+i] = (await $api.dbTableWebhookFilter.create(hookId, {
              ...filter,
-              fk_parent_id: parentId,
+              fk_parent_id: parentId.value,
            })) as unknown as FilterType
          } else {
            filters.value[+i] = await $api.dbTableFilter.create(view?.value?.id as string, {
              ...filter,
-              fk_parent_id: parentId,
+              fk_parent_id: parentId.value,
            })
          }

+          if (children) filters.value[+i].children = children
+
          allFilters.value.push(filters.value[+i])
        }
      }
@ -335,7 +351,7 @@ export function useViewFilters(
      } else if (filter.id && filter.status !== 'create') {
        await $api.dbTableFilter.update(filter.id, {
          ...filter,
-          fk_parent_id: parentId,
+          fk_parent_id: parentId.value,
        })
        $e('a:filter:update', {
          logical: filter.logical_op,
@ -344,7 +360,7 @@ export function useViewFilters(
      } else {
        filters.value[i] = await $api.dbTableFilter.create(view.value.id!, {
          ...filter,
-          fk_parent_id: parentId,
+          fk_parent_id: parentId.value,
        })

        allFilters.value.push(filters.value[+i])
@ -464,11 +480,7 @@ export function useViewFilters(
  const addFilterGroup = async () => {
    const child = placeholderFilter()

-    const placeHolderGroupFilter: Filter = {
-      is_group: true,
-      status: 'create',
-      logical_op: 'and',
-    }
+    const placeHolderGroupFilter: Filter = placeholderGroupFilter()

    if (nestedMode.value) placeHolderGroupFilter.children = [child]

@ -476,7 +488,7 @@ export function useViewFilters(

    const index = filters.value.length - 1

-    await saveOrUpdate(filters.value[index], index, true)
+    await saveOrUpdate(filters.value[index], index)

    lastFilters.value = clone(filters.value)

--- a/packages/nc-gui/store/bases.ts
+++ b/packages/nc-gui/store/bases.ts
@ -43,6 +43,8 @@ export const useBases = defineStore('basesStore', () => {
    return basesMap
  })

+  const isDataSourceLimitReached = computed(() => Number(openedProject.value?.sources?.length) > 9)
+
  const workspaceStore = useWorkspace()
  const tableStore = useTablesStore()

@ -389,6 +391,7 @@ export const useBases = defineStore('basesStore', () => {
    toggleStarred,
    basesUser,
    clearBasesUser,
+    isDataSourceLimitReached,
  }
 })

--- a/packages/nocodb/src/helpers/webhookHelpers.ts
+++ b/packages/nocodb/src/helpers/webhookHelpers.ts
@ -51,9 +51,6 @@ export async function validateCondition(
  for (const _filter of filters) {
    const filter = _filter instanceof Filter ? _filter : new Filter(_filter);
    let res;
-    const column = await filter.getColumn();
-    const field = column.title;
-    let val = data[field];
    if (filter.is_group) {
      res = await validateCondition(
        filter.children || (await filter.getChildren()),
@ -62,7 +59,11 @@ export async function validateCondition(
          client,
        },
      );
-    } else if (
+    } else {
+      const column = await filter.getColumn();
+      const field = column.title;
+      let val = data[field];
+      if (
        [
          UITypes.Date,
          UITypes.DateTime,
@ -296,6 +297,7 @@ export async function validateCondition(
            break;
        }
      }
+    }

    switch (filter.logical_op) {
      case 'or':
--- a/packages/nocodb/src/models/Filter.ts
+++ b/packages/nocodb/src/models/Filter.ts
@ -515,7 +515,9 @@ export default class Filter implements FilterType {
      });
      await NocoCache.setList(CacheScope.FILTER_EXP, [hookId], filterObjs);
    }
-    return filterObjs?.map((f) => this.castType(f));
+    return filterObjs
+      ?.filter((f) => !f.fk_parent_id)
+      ?.map((f) => this.castType(f));
  }

  static async parentFilterList(