MirrorSave
/
budibase
mirror of https://github.com/Budibase/budibase.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

reverts some of the merged files

This commit is contained in:
Keviin Åberg Kultalahti 2021-03-18 14:33:45 +01:00
parent fcd7d577d0
commit cc363fa463
17 changed files with 22 additions and 60 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
packages/builder/.gitignore vendored
View File

@ -7,4 +7,4 @@ dist/
routify routify
cypress/videos cypress/videos
cypress/screenshots cypress/screenshots
.routify .routify/

2
packages/builder/src/components/automation/AutomationPanel/AutomationList.svelte
View File

@ -1,6 +1,6 @@
<script> <script>
import { onMount } from "svelte" import { onMount } from "svelte"
import { goto } from "@sveltech/routify" import { goto } from "@roxi/routify"
import { automationStore } from "builderStore" import { automationStore } from "builderStore"
import NavItem from "components/common/NavItem.svelte" import NavItem from "components/common/NavItem.svelte"
import EditAutomationPopover from "./EditAutomationPopover.svelte" import EditAutomationPopover from "./EditAutomationPopover.svelte"

2
packages/builder/src/components/automation/AutomationPanel/CreateAutomationModal.svelte
View File

@ -1,6 +1,6 @@
<script> <script>
import { backendUiStore, automationStore } from "builderStore" import { backendUiStore, automationStore } from "builderStore"
import { goto } from "@sveltech/routify" import { goto } from "@roxi/routify"
import { notifier } from "builderStore/store/notifications" import { notifier } from "builderStore/store/notifications"
import { Input, ModalContent } from "@budibase/bbui" import { Input, ModalContent } from "@budibase/bbui"
import analytics from "analytics" import analytics from "analytics"

2
packages/builder/src/components/automation/AutomationPanel/EditAutomationPopover.svelte
View File

@ -1,5 +1,5 @@
<script> <script>
import { goto } from "@sveltech/routify" import { goto } from "@roxi/routify"
import { automationStore, backendUiStore } from "builderStore" import { automationStore, backendUiStore } from "builderStore"
import { notifier } from "builderStore/store/notifications" import { notifier } from "builderStore/store/notifications"
import { DropdownMenu } from "@budibase/bbui" import { DropdownMenu } from "@budibase/bbui"

2
packages/builder/src/components/backend/DatasourceNavigator/popovers/EditDatasourcePopover.svelte
View File

@ -1,5 +1,5 @@
<script> <script>
import { goto } from "@sveltech/routify" import { goto } from "@roxi/routify"
import { backendUiStore } from "builderStore" import { backendUiStore } from "builderStore"
import { notifier } from "builderStore/store/notifications" import { notifier } from "builderStore/store/notifications"
import { DropdownMenu } from "@budibase/bbui" import { DropdownMenu } from "@budibase/bbui"

2
packages/builder/src/pages/[application]/automate/[automation]/_layout.svelte
View File

@ -1,6 +1,6 @@
<script> <script>
import { automationStore } from "builderStore" import { automationStore } from "builderStore"
import { params } from "@sveltech/routify" import { params } from "@roxi/routify"
if ($params.automation) { if ($params.automation) {
const automation = $automationStore.automations.find( const automation = $automationStore.automations.find(

2
packages/builder/src/pages/[application]/automate/index.svelte
View File

@ -1,5 +1,5 @@
<script> <script>
import { goto, leftover } from "@sveltech/routify" import { goto, leftover } from "@roxi/routify"
import { onMount } from 'svelte' import { onMount } from 'svelte'
import { automationStore } from "builderStore" import { automationStore } from "builderStore"

2
packages/builder/src/pages/[application]/data/_layout.svelte
View File

@ -1,5 +1,5 @@
<script> <script>
import { isActive, goto } from "@sveltech/routify" import { isActive, goto } from "@roxi/routify"
import { Switcher, Modal } from "@budibase/bbui" import { Switcher, Modal } from "@budibase/bbui"
import TableNavigator from "components/backend/TableNavigator/TableNavigator.svelte" import TableNavigator from "components/backend/TableNavigator/TableNavigator.svelte"
import DatasourceNavigator from "components/backend/DatasourceNavigator/DatasourceNavigator.svelte" import DatasourceNavigator from "components/backend/DatasourceNavigator/DatasourceNavigator.svelte"

2
packages/builder/src/pages/[application]/data/datasource/[selectedDatasource]/[query]/_layout.svelte
View File

@ -1,5 +1,5 @@
<script> <script>
import { params } from "@sveltech/routify" import { params } from "@roxi/routify"
import { backendUiStore } from "builderStore" import { backendUiStore } from "builderStore"
if ($params.query) { if ($params.query) {

2
packages/builder/src/pages/[application]/data/datasource/[selectedDatasource]/index.svelte
View File

@ -1,5 +1,5 @@
<script> <script>
import { goto, beforeUrlChange } from "@sveltech/routify" import { goto, beforeUrlChange } from "@roxi/routify"
import { Button, Heading, Body, Spacer } from "@budibase/bbui" import { Button, Heading, Body, Spacer } from "@budibase/bbui"
import { backendUiStore } from "builderStore" import { backendUiStore } from "builderStore"
import { notifier } from "builderStore/store/notifications" import { notifier } from "builderStore/store/notifications"

18
packages/builder/src/pages/[application]/data/datasource/_layout.svelte
View File

@ -1,18 +0,0 @@
<script>
import { backendUiStore } from "builderStore"
import { goto, leftover } from "@roxi/routify"
import { onMount } from "svelte"
onMount(async () => {
// navigate to first datasource in list, if not already selected
if (
!$leftover &&
$backendUiStore.datasources.length > 0 &&
!$backendUiStore.selectedDatasourceId
) {
$goto(`./${$backendUiStore.datasources[0]._id}`)
}
})
</script>
<slot />

4
packages/builder/src/pages/[application]/data/datasource/index.svelte
View File

@ -1,11 +1,11 @@
<script> <script>
import { backendUiStore } from "builderStore" import { backendUiStore } from "builderStore"
import { goto } from "@sveltech/routify" import { goto } from "@roxi/routify"
import { onMount } from "svelte" import { onMount } from "svelte"
onMount(async () => { onMount(async () => {
// navigate to first table in list, if not already selected // navigate to first table in list, if not already selected
$backendUiStore.datasources.length > 0 && $goto(`../${$backendUiStore.datasources[0]._id}`) $backendUiStore.datasources.length > 0 && $goto(`./${$backendUiStore.datasources[0]._id}`)
}) })
</script> </script>

19
packages/builder/src/pages/[application]/data/table/_layout.svelte
View File

@ -1,19 +0,0 @@
<script>
import { backendUiStore } from "builderStore"
import { goto, leftover } from "@roxi/routify"
import { onMount } from "svelte"
onMount(async () => {
// navigate to first table in list, if not already selected
// and this is the final url (i.e. no selectedTable)
if (
!$leftover &&
$backendUiStore.tables.length > 0 &&
(!$backendUiStore.selectedTable || !$backendUiStore.selectedTable._id)
) {
$goto(`./${$backendUiStore.tables[0]._id}`)
}
})
</script>
<slot />

4
packages/builder/src/pages/[application]/data/table/index.svelte
View File

@ -1,10 +1,10 @@
<script> <script>
import { backendUiStore } from "builderStore" import { backendUiStore } from "builderStore"
import { goto } from "@sveltech/routify" import { goto } from "@roxi/routify"
import { onMount } from "svelte" import { onMount } from "svelte"
onMount(async () => { onMount(async () => {
$backendUiStore.tables.length > 0 && $goto(`../${$backendUiStore.tables[0]._id}`) $backendUiStore.tables.length > 0 && $goto(`./${$backendUiStore.tables[0]._id}`)
}) })
</script> </script>

1
packages/builder/src/pages/index.svelte
View File

@ -1,5 +1,4 @@
<script> <script>
import { store } from "builderStore"
import api from "builderStore/api" import api from "builderStore/api"
import AppList from "components/start/AppList.svelte" import AppList from "components/start/AppList.svelte"
import { get } from "builderStore/api" import { get } from "builderStore/api"

8
packages/client/yarn.lock
View File

@ -1699,10 +1699,10 @@ svelte-spa-router@^3.0.5:
dependencies: dependencies:
regexparam "1.3.0" regexparam "1.3.0"
svelte@^3.30.0: svelte@^3.35.0:
version "3.30.0" version "3.35.0"
resolved "https://registry.yarnpkg.com/svelte/-/svelte-3.30.0.tgz#cbde341e96bf34f4ac73c8f14f8a014e03bfb7d6" resolved "https://registry.yarnpkg.com/svelte/-/svelte-3.35.0.tgz#e0d0ba60c4852181c2b4fd851194be6fda493e65"
integrity sha512-z+hdIACb9TROGvJBQWcItMtlr4s0DBUgJss6qWrtFkOoIInkG+iAMo/FJZQFyDBQZc+dul2+TzYSi/tpTT5/Ag== integrity sha512-gknlZkR2sXheu/X+B7dDImwANVvK1R0QGQLd8CNIfxxGPeXBmePnxfzb6fWwTQRsYQG7lYkZXvpXJvxvpsoB7g==
symbol-tree@^3.2.4: symbol-tree@^3.2.4:
version "3.2.4" version "3.2.4"

8
packages/standard-components/yarn.lock
View File

@ -2830,10 +2830,10 @@ svelte-portal@^1.0.0:
resolved "https://registry.yarnpkg.com/svelte-portal/-/svelte-portal-1.0.0.tgz#36a47c5578b1a4d9b4dc60fa32a904640ec4cdd3" resolved "https://registry.yarnpkg.com/svelte-portal/-/svelte-portal-1.0.0.tgz#36a47c5578b1a4d9b4dc60fa32a904640ec4cdd3"
integrity sha512-nHf+DS/jZ6jjnZSleBMSaZua9JlG5rZv9lOGKgJuaZStfevtjIlUJrkLc3vbV8QdBvPPVmvcjTlazAzfKu0v3Q== integrity sha512-nHf+DS/jZ6jjnZSleBMSaZua9JlG5rZv9lOGKgJuaZStfevtjIlUJrkLc3vbV8QdBvPPVmvcjTlazAzfKu0v3Q==
svelte@^3.30.0: svelte@^3.35.0:
version "3.30.0" version "3.35.0"
resolved "https://registry.yarnpkg.com/svelte/-/svelte-3.30.0.tgz#cbde341e96bf34f4ac73c8f14f8a014e03bfb7d6" resolved "https://registry.yarnpkg.com/svelte/-/svelte-3.35.0.tgz#e0d0ba60c4852181c2b4fd851194be6fda493e65"
integrity sha512-z+hdIACb9TROGvJBQWcItMtlr4s0DBUgJss6qWrtFkOoIInkG+iAMo/FJZQFyDBQZc+dul2+TzYSi/tpTT5/Ag== integrity sha512-gknlZkR2sXheu/X+B7dDImwANVvK1R0QGQLd8CNIfxxGPeXBmePnxfzb6fWwTQRsYQG7lYkZXvpXJvxvpsoB7g==
svg.draggable.js@^2.2.2: svg.draggable.js@^2.2.2:
version "2.2.2" version "2.2.2"