CodeMirror/budibase
1
0
Fork 0
mirror of synced 2024-07-03 05:20:32 +12:00
Code Issues Projects Releases Wiki Activity

Merge pull request #1181 from Budibase/bug/view-relationships

Browse source 
Relationship view enrichment
This commit is contained in:
Michael Drury 2021-02-24 17:31:23 +00:00 committed by GitHub
parent ef069f9a1c a69cc49501
commit 90df79052a
2 changed files with 12 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
packages/builder/src/components/backend/DataTable/popovers/GroupByPopover.svelte
View file

@ -2,6 +2,7 @@
import { Button, Input, Select } from "@budibase/bbui"
import { backendUiStore } from "builderStore"
import { notifier } from "builderStore/store/notifications"
import { FIELDS } from "constants/backend"
export let view = {}
export let onClosed
@ -9,7 +10,11 @@
$: viewTable = $backendUiStore.tables.find(
({ _id }) => _id === $backendUiStore.selectedView.tableId
)
$: fields = viewTable && Object.keys(viewTable.schema)
$: fields =
viewTable &&
Object.entries(viewTable.schema)
.filter(entry => entry[1].type !== FIELDS.LINK.type)
.map(([key]) => key)
function saveView() {
backendUiStore.actions.views.save(view)

7
packages/server/src/api/controllers/row.js
View file

@ -202,6 +202,11 @@ exports.fetchView = async function(ctx) {
const db = new CouchDB(appId)
const { calculation, group, field } = ctx.query
const designDoc = await db.get("_design/database")
const viewInfo = designDoc.views[viewName]
if (!viewInfo) {
ctx.throw(400, "View does not exist.")
}
const response = await db.query(`database/${viewName}`, {
include_docs: !calculation,
group,
@ -211,7 +216,7 @@ exports.fetchView = async function(ctx) {
response.rows = response.rows.map(row => row.doc)
let table
try {
table = await db.get(ctx.params.tableId)
table = await db.get(viewInfo.meta.tableId)
} catch (err) {
table = {
schema: {},