Browse Source

fix(nc-gui): shared kanban view shows empty page

#3839
pull/3563/head
Wing-Kam Wong 2 years ago
parent
commit
14f5c64d46
  1. 12
      packages/nc-gui/components/shared-view/Kanban.vue
  2. 17
      packages/nc-gui/composables/useKanbanViewStore.ts

12
packages/nc-gui/components/shared-view/Kanban.vue

@ -1,5 +1,13 @@
<script setup lang="ts"> <script setup lang="ts">
import { ActiveViewInj, FieldsInj, IsPublicInj, MetaInj, ReadonlyInj, ReloadViewDataHookInj } from '#imports' import {
ActiveViewInj,
FieldsInj,
IsPublicInj,
MetaInj,
ReadonlyInj,
ReloadViewDataHookInj,
useProvideKanbanViewStore,
} from '#imports'
const { sharedView, meta, sorts, nestedFilters } = useSharedView() const { sharedView, meta, sorts, nestedFilters } = useSharedView()
@ -18,6 +26,8 @@ provide(FieldsInj, ref(meta.value?.columns || []))
provide(IsPublicInj, ref(true)) provide(IsPublicInj, ref(true))
useProvideSmartsheetStore(sharedView, meta, true, sorts, nestedFilters) useProvideSmartsheetStore(sharedView, meta, true, sorts, nestedFilters)
useProvideKanbanViewStore(meta, sharedView, true)
</script> </script>
<template> <template>

17
packages/nc-gui/composables/useKanbanViewStore.ts

@ -9,8 +9,9 @@ type GroupingFieldColOptionsType = SelectOptionType & { collapsed: boolean }
const [useProvideKanbanViewStore, useKanbanViewStore] = useInjectionState( const [useProvideKanbanViewStore, useKanbanViewStore] = useInjectionState(
( (
meta: Ref<TableType | undefined> | ComputedRef<TableType | undefined>, meta: Ref<TableType | KanbanType | undefined>,
viewMeta: Ref<ViewType | undefined> | ComputedRef<(ViewType & { id: string }) | undefined>, viewMeta: Ref<ViewType | KanbanType | undefined> | ComputedRef<(ViewType & { id: string }) | undefined>,
shared = false,
) => { ) => {
if (!meta) { if (!meta) {
throw new Error('Table meta is not available') throw new Error('Table meta is not available')
@ -30,7 +31,7 @@ const [useProvideKanbanViewStore, useKanbanViewStore] = useInjectionState(
const { isUIAllowed } = useUIPermission() const { isUIAllowed } = useUIPermission()
const isPublic = inject(IsPublicInj, ref(false)) const isPublic = ref(shared) || inject(IsPublicInj, ref(false))
const password = ref<string | null>(null) const password = ref<string | null>(null)
@ -138,7 +139,7 @@ const [useProvideKanbanViewStore, useKanbanViewStore] = useInjectionState(
: await $api.dbView.kanbanRead(viewMeta.value.id) : await $api.dbView.kanbanRead(viewMeta.value.id)
// set groupingField // set groupingField
groupingFieldColumn.value = groupingFieldColumn.value =
meta.value.columns.filter((f: ColumnType) => f.id === kanbanMetaData.value.grp_column_id)[0] || {} (meta.value.columns as ColumnType[]).filter((f) => f.id === kanbanMetaData.value.grp_column_id)[0] || {}
groupingField.value = groupingFieldColumn.value.title! groupingField.value = groupingFieldColumn.value.title!
@ -253,9 +254,9 @@ const [useProvideKanbanViewStore, useKanbanViewStore] = useInjectionState(
async function insertRow(row: Record<string, any>, rowIndex = formattedData.value.uncatgorized?.length) { async function insertRow(row: Record<string, any>, rowIndex = formattedData.value.uncatgorized?.length) {
try { try {
const insertObj = meta?.value?.columns?.reduce((o: any, col) => { const insertObj = (meta?.value?.columns as ColumnType[]).reduce((o: Record<string, any>, col) => {
if (!col.ai && row?.[col.title as string] !== null) { if (!col.ai && row?.[col.title as string] !== null) {
o[col.title as string] = row?.[col.title as string] o[col.title!] = row?.[col.title as string]
} }
return o return o
}, {}) }, {})
@ -421,9 +422,9 @@ const [useProvideKanbanViewStore, useKanbanViewStore] = useInjectionState(
} }
} else { } else {
// update existing record // update existing record
const targetPrimaryKey = extractPkFromRow(row.row, meta!.value!.columns!) const targetPrimaryKey = extractPkFromRow(row.row, meta!.value!.columns as ColumnType[])
const idxToUpdate = formattedData.value[stackTitle].findIndex( const idxToUpdate = formattedData.value[stackTitle].findIndex(
(ele) => extractPkFromRow(ele.row, meta!.value!.columns!) === targetPrimaryKey, (ele) => extractPkFromRow(ele.row, meta!.value!.columns as ColumnType[]) === targetPrimaryKey,
) )
if (idxToUpdate !== -1) { if (idxToUpdate !== -1) {
// update the row in formattedData // update the row in formattedData

Loading…
Cancel
Save