Browse Source

Code style check

master
Dean 5 years ago
parent
commit
4cc1a85f25
  1. 2
      packages/backend-core/src/context/index.js
  2. 2
      packages/builder/src/components/deploy/DeploymentHistory.svelte
  3. 4
      packages/builder/src/components/deploy/utils.js
  4. 1
      packages/builder/src/components/start/AppRow.svelte
  5. 4
      packages/builder/src/pages/builder/app/[application]/_layout.svelte
  6. 4
      packages/server/src/api/controllers/application.js
  7. 4
      packages/server/src/api/controllers/deploy/index.js

2
packages/backend-core/src/context/index.js

@ -178,7 +178,7 @@ function getDB(key, opts) {
const appId = exports.getAppId() const appId = exports.getAppId()
const CouchDB = getCouch() const CouchDB = getCouch()
let toUseAppId let toUseAppId
switch (key) { switch (key) {
case ContextKeys.CURRENT_DB: case ContextKeys.CURRENT_DB:
toUseAppId = appId toUseAppId = appId

2
packages/builder/src/components/deploy/DeploymentHistory.svelte

@ -49,7 +49,7 @@
newDeployments newDeployments
) )
if (pendingDeployments.length) { if (pendingDeployments.length) {
showErrorReasonModal(incomingDeployment.err) showErrorReasonModal(pendingDeployments[0].err)
} }
} }
deployments = newDeployments deployments = newDeployments

4
packages/builder/src/components/deploy/utils.js

@ -20,6 +20,6 @@ export function checkIncomingDeploymentStatus(current, incoming) {
acc.push(incomingDeployment) acc.push(incomingDeployment)
} }
} }
return acc; return acc
}, []) }, [])
} }

1
packages/builder/src/components/start/AppRow.svelte

@ -5,7 +5,6 @@
Icon, Icon,
ActionMenu, ActionMenu,
MenuItem, MenuItem,
ButtonGroup,
StatusLight, StatusLight,
} from "@budibase/bbui" } from "@budibase/bbui"
import { processStringSync } from "@budibase/string-templates" import { processStringSync } from "@budibase/string-templates"

4
packages/builder/src/pages/builder/app/[application]/_layout.svelte

@ -1,5 +1,5 @@
<script> <script>
import { store, automationStore, allScreens } from "builderStore" import { store, automationStore } from "builderStore"
import { roles, flags } from "stores/backend" import { roles, flags } from "stores/backend"
import { import {
Icon, Icon,
@ -32,7 +32,7 @@
let promise = getPackage() let promise = getPackage()
let unpublishModal let unpublishModal
let publishPopover let publishPopover
let notPublishedPopover // let notPublishedPopover
$: enrichedApps = enrichApps($apps, $auth.user) $: enrichedApps = enrichApps($apps, $auth.user)
const enrichApps = (apps, user) => { const enrichApps = (apps, user) => {

4
packages/server/src/api/controllers/application.js

@ -356,7 +356,7 @@ exports.delete = async ctx => {
appId = getProdAppID(appId) appId = getProdAppID(appId)
} }
const db = ctx.query.unpublish ? getProdAppDB() : getAppDB(); const db = ctx.query.unpublish ? getProdAppDB() : getAppDB()
const result = await db.destroy() const result = await db.destroy()
/* istanbul ignore next */ /* istanbul ignore next */
@ -369,7 +369,7 @@ exports.delete = async ctx => {
// make sure the app/role doesn't stick around after the app has been deleted // make sure the app/role doesn't stick around after the app has been deleted
await removeAppFromUserRoles(ctx, appId) await removeAppFromUserRoles(ctx, appId)
await appCache.invalidateAppMetadata(appId) await appCache.invalidateAppMetadata(appId)
ctx.status = 200 ctx.status = 200
ctx.body = result ctx.body = result
} }

4
packages/server/src/api/controllers/deploy/index.js

@ -110,9 +110,9 @@ async function deployApp(deployment) {
console.log("replication complete.. replacing app meta doc") console.log("replication complete.. replacing app meta doc")
const db = getProdAppDB() const db = getProdAppDB()
const appDoc = await db.get(DocumentTypes.APP_METADATA) const appDoc = await db.get(DocumentTypes.APP_METADATA)
deployment.appUrl = appDoc.url deployment.appUrl = appDoc.url
appDoc.appId = productionAppId appDoc.appId = productionAppId
appDoc.instance._id = productionAppId appDoc.instance._id = productionAppId
await db.put(appDoc) await db.put(appDoc)

Loading…
Cancel
Save