Merge branch 'feature/plugin-management-ui' of github.com:Budibase/budibase into feature/plugin-management-ui

This commit is contained in:
Andrew Kingston 2022-09-12 16:40:05 +01:00
commit fdba44502f
2 changed files with 9 additions and 11 deletions

View File

@ -1,20 +1,20 @@
import { ObjectStoreBuckets } from "../../constants" import { ObjectStoreBuckets } from "../../../constants"
import { loadJSFile } from "../../utilities/fileSystem" import { loadJSFile } from "../../../utilities/fileSystem"
import { import {
uploadedNpmPlugin, uploadedNpmPlugin,
uploadedUrlPlugin, uploadedUrlPlugin,
uploadedGithubPlugin, uploadedGithubPlugin,
uploadedFilePlugin, uploadedFilePlugin,
} from "./plugin/utils" } from "./utils"
import { getGlobalDB } from "@budibase/backend-core/tenancy" import { getGlobalDB } from "@budibase/backend-core/tenancy"
import { validate } from "@budibase/backend-core/plugins" import { validate } from "@budibase/backend-core/plugins"
import { generatePluginID, getPluginParams } from "../../db/utils" import { generatePluginID, getPluginParams } from "../../../db/utils"
import { import {
uploadDirectory, uploadDirectory,
deleteFolder, deleteFolder,
} from "@budibase/backend-core/objectStore" } from "@budibase/backend-core/objectStore"
import { PluginType, FileType } from "@budibase/types" import { PluginType, FileType } from "@budibase/types"
import env from "../../environment" import env from "../../../environment"
export async function getPlugins(type?: PluginType) { export async function getPlugins(type?: PluginType) {
const db = getGlobalDB() const db = getGlobalDB()

View File

@ -426,36 +426,34 @@ exports.getDatasourcePlugin = async (name, url, hash) => {
/** /**
* Find for a file recursively from start path applying filter, return first match * Find for a file recursively from start path applying filter, return first match
*/ */
const findFileRec = (startPath, filter) => { exports.findFileRec = (startPath, filter) => {
if (!fs.existsSync(startPath)) { if (!fs.existsSync(startPath)) {
return return
} }
var files = fs.readdirSync(startPath) const files = fs.readdirSync(startPath)
for (let i = 0, len = files.length; i < len; i++) { for (let i = 0, len = files.length; i < len; i++) {
const filename = join(startPath, files[i]) const filename = join(startPath, files[i])
const stat = fs.lstatSync(filename) const stat = fs.lstatSync(filename)
if (stat.isDirectory()) { if (stat.isDirectory()) {
return findFileRec(filename, filter) return exports.findFileRec(filename, filter)
} else if (filename.endsWith(filter)) { } else if (filename.endsWith(filter)) {
return filename return filename
} }
} }
} }
exports.findFileRec = findFileRec
/** /**
* Remove a folder which is not empty from the file system * Remove a folder which is not empty from the file system
*/ */
const deleteFolderFileSystem = path => { exports.deleteFolderFileSystem = path => {
if (!fs.existsSync(path)) { if (!fs.existsSync(path)) {
return return
} }
fs.rmSync(path, { recursive: true, force: true }) fs.rmSync(path, { recursive: true, force: true })
} }
exports.deleteFolderFileSystem = deleteFolderFileSystem
/** /**
* Full function definition for below can be found in the utilities. * Full function definition for below can be found in the utilities.