CodeMirror/budibase
1
0
Fork 0
mirror of synced 2024-07-01 04:21:06 +12:00
Code Issues Projects Releases Wiki Activity

fixng some auto screen bugs

Browse source
This commit is contained in:
Peter Clement 2021-11-23 09:39:40 +00:00
parent 33f1264cbb
commit a68247ffcb
3 changed files with 3 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
packages/builder/cypress/support/commands.js
View file

@ -195,10 +195,7 @@ Cypress.Commands.add("createScreen", (screenName, route) => {
cy.get("input").first().clear().type(screenName) cy.get("input").first().clear().type(screenName)
cy.get("input").eq(1).clear().type(route) cy.get("input").eq(1).clear().type(route)
cy.get(".spectrum-Button--cta").click() cy.get(".spectrum-Button--cta").click()
}) cy.wait(2000)
cy.get(".spectrum-Modal").within(() => {
cy.get(`[data-cy="left-nav"]`).click()
cy.get(".spectrum-Button--cta").click()
}) })
}) })

4
packages/builder/src/components/design/NavigationPanel/NewScreenModal.svelte
View file

@ -13,7 +13,6 @@
$: blankSelected = selectedScreens?.length === 1 $: blankSelected = selectedScreens?.length === 1
$: autoSelected = selectedScreens?.length > 0 && !blankSelected $: autoSelected = selectedScreens?.length > 0 && !blankSelected
let templates = getTemplates($store, $tables.list) let templates = getTemplates($store, $tables.list)
const toggleScreenSelection = table => { const toggleScreenSelection = table => {
if (selectedScreens.find(s => s.name.includes(table.name))) { if (selectedScreens.find(s => s.name.includes(table.name))) {
selectedScreens = selectedScreens.filter( selectedScreens = selectedScreens.filter(
@ -26,6 +25,7 @@
selectedScreens = [...partialTemplates, ...selectedScreens] selectedScreens = [...partialTemplates, ...selectedScreens]
} }
} }
$: console.log($tables.list)
</script> </script>
<ModalContent <ModalContent
@ -61,7 +61,7 @@
</div> </div>
<Detail size="S">Autogenerated Screens</Detail> <Detail size="S">Autogenerated Screens</Detail>
{#each $tables.list.filter(table => table.type !== "external") as table} {#each $tables.list.filter(table => table.type !== "external" && table._id !== "ta_users") as table}
<div <div
class:disabled={blankSelected} class:disabled={blankSelected}
class:selected={selectedScreens.find(x => x.name.includes(table.name))} class:selected={selectedScreens.find(x => x.name.includes(table.name))}

4
packages/builder/src/components/design/NavigationPanel/ScreenWizard.svelte
View file

@ -1,5 +1,4 @@
<script> <script>
import NavigationSelectionModal from "components/design/NavigationPanel/NavigationSelectionModal.svelte"
import ScreenDetailsModal from "components/design/NavigationPanel/ScreenDetailsModal.svelte" import ScreenDetailsModal from "components/design/NavigationPanel/ScreenDetailsModal.svelte"
import NewScreenModal from "components/design/NavigationPanel/NewScreenModal.svelte" import NewScreenModal from "components/design/NavigationPanel/NewScreenModal.svelte"
import sanitizeUrl from "builderStore/store/screenTemplates/utils/sanitizeUrl" import sanitizeUrl from "builderStore/store/screenTemplates/utils/sanitizeUrl"
@ -116,6 +115,3 @@
<Modal bind:this={screenDetailsModal}> <Modal bind:this={screenDetailsModal}>
<ScreenDetailsModal bind:screenName bind:url {save} {chooseModal} /> <ScreenDetailsModal bind:screenName bind:url {save} {chooseModal} />
</Modal> </Modal>
<Modal bind:this={navigationSelectionModal}>
<NavigationSelectionModal {chooseModal} {save} />
</Modal>