This commit is contained in:
Martin McKeaveney 2021-06-18 22:18:18 +01:00
parent 2ac02b9f44
commit 0f8b3c52be
3 changed files with 20 additions and 7 deletions

View File

@ -1,8 +1,16 @@
<script> <script>
import {goto} from "@roxi/routify" import { goto } from "@roxi/routify"
import {allScreens, store} from "builderStore" import { allScreens, store } from "builderStore"
import {tables} from "stores/backend" import { tables } from "stores/backend"
import {ActionMenu, Icon, Input, MenuItem, Modal, ModalContent, notifications} from "@budibase/bbui" import {
ActionMenu,
Icon,
Input,
MenuItem,
Modal,
ModalContent,
notifications,
} from "@budibase/bbui"
import ConfirmDialog from "components/common/ConfirmDialog.svelte" import ConfirmDialog from "components/common/ConfirmDialog.svelte"
export let table export let table
@ -17,7 +25,9 @@
$: external = table?.type === "external" $: external = table?.type === "external"
function showDeleteModal() { function showDeleteModal() {
templateScreens = $allScreens.filter(screen => screen.autoTableId === table._id) templateScreens = $allScreens.filter(
screen => screen.autoTableId === table._id
)
willBeDeleted = ["All table data"].concat( willBeDeleted = ["All table data"].concat(
templateScreens.map(screen => `Screen ${screen.props._instanceName}`) templateScreens.map(screen => `Screen ${screen.props._instanceName}`)
) )

View File

@ -8,7 +8,7 @@
// and this is the final url (i.e. no selectedTable) // and this is the final url (i.e. no selectedTable)
if ( if (
!$leftover && !$leftover &&
$tables.list.length > 0 && $tables.list.length > 0 &&
(!$tables.selected || !$tables.selected._id) (!$tables.selected || !$tables.selected._id)
) { ) {
$goto(`./${$tables.list[0]._id}`) $goto(`./${$tables.list[0]._id}`)

View File

@ -8,7 +8,10 @@ const { getAutomationParams } = require("../db/utils")
const { coerce } = require("../utilities/rowProcessor") const { coerce } = require("../utilities/rowProcessor")
const { utils } = require("@budibase/auth/redis") const { utils } = require("@budibase/auth/redis")
const { JobQueues } = require("../constants") const { JobQueues } = require("../constants")
const { isExternalTable, breakExternalTableId } = require("../integrations/utils") const {
isExternalTable,
breakExternalTableId,
} = require("../integrations/utils")
const { getExternalTable } = require("../api/controllers/table/utils") const { getExternalTable } = require("../api/controllers/table/utils")
const { opts } = utils.getRedisOptions() const { opts } = utils.getRedisOptions()