From e244e099a67c86bf83aef3ac5db4eb6edaade725 Mon Sep 17 00:00:00 2001 From: Martin McKeaveney Date: Mon, 18 May 2020 11:18:31 +0100 Subject: [PATCH] fixing CI --- .eslintrc.json | 3 ++- packages/builder/src/builderStore/store/index.js | 12 +++++++----- .../userInterface/AppPreview/iframeTemplate.js | 6 +++--- packages/builder/tests/createProps.spec.js | 9 --------- packages/cli/package.json | 3 --- .../commands/new/appDirectoryTemplate/package.json | 3 --- packages/server/src/api/controllers/model.js | 2 +- packages/server/src/api/controllers/view.js | 2 +- 8 files changed, 14 insertions(+), 26 deletions(-) diff --git a/.eslintrc.json b/.eslintrc.json index 2d9ab315a3..5c12e7c29c 100644 --- a/.eslintrc.json +++ b/.eslintrc.json @@ -21,6 +21,7 @@ } ], "rules": { - "prettier/prettier": "error" + "prettier/prettier": "error", + "no-self-assign": "off" } } \ No newline at end of file diff --git a/packages/builder/src/builderStore/store/index.js b/packages/builder/src/builderStore/store/index.js index 63b8ef16be..ae6fee5345 100644 --- a/packages/builder/src/builderStore/store/index.js +++ b/packages/builder/src/builderStore/store/index.js @@ -251,12 +251,12 @@ const renameScreen = store => (oldname, newname) => { const savePage = store => async page => { store.update(state => { - if (s.currentFrontEndType !== "page" || !s.currentPageName) { + if (state.currentFrontEndType !== "page" || !state.currentPageName) { return state } - s.pages[s.currentPageName] = page - _savePage(s) + state.pages[state.currentPageName] = page + _savePage(state) return state }) } @@ -271,7 +271,9 @@ const addStylesheet = store => stylesheet => { const removeStylesheet = store => stylesheet => { store.update(state => { - state.pages.stylesheets = s.pages.stylesheets.filter(s => s !== stylesheet) + state.pages.stylesheets = state.pages.stylesheets.filter( + s => s !== stylesheet + ) _savePage(state) return state }) @@ -446,7 +448,7 @@ const setComponentCode = store => code => { // save without messing with the store _saveScreenApi(state.currentPreviewItem, state) - return s + return state }) } diff --git a/packages/builder/src/components/userInterface/AppPreview/iframeTemplate.js b/packages/builder/src/components/userInterface/AppPreview/iframeTemplate.js index 57ae0a71c2..3c774cc4b8 100644 --- a/packages/builder/src/components/userInterface/AppPreview/iframeTemplate.js +++ b/packages/builder/src/components/userInterface/AppPreview/iframeTemplate.js @@ -32,8 +32,8 @@ export default ({ text-transform: uppercase; font-weight: bold; } - <\/style> - <\script> + + diff --git a/packages/builder/tests/createProps.spec.js b/packages/builder/tests/createProps.spec.js index c4e4d80298..269ab8156a 100644 --- a/packages/builder/tests/createProps.spec.js +++ b/packages/builder/tests/createProps.spec.js @@ -29,15 +29,6 @@ describe("createDefaultProps", () => { expect(props._component).toBe("some_component") }) - it("should return error when component name not supplied", () => { - const comp = getcomponent() - comp.name = "" - - const { errors } = createProps(comp) - - expect(errors.length).toEqual(1) - }) - it("should create a object with single blank string value, when prop definition is 'string' ", () => { const comp = getcomponent() comp.props.fieldName = "string" diff --git a/packages/cli/package.json b/packages/cli/package.json index 4abc9ec99d..768402cc2b 100644 --- a/packages/cli/package.json +++ b/packages/cli/package.json @@ -11,9 +11,6 @@ "publishConfig": { "access": "public" }, - "scripts": { - "test": "test" - }, "keywords": [ "budibase" ], diff --git a/packages/cli/src/commands/new/appDirectoryTemplate/package.json b/packages/cli/src/commands/new/appDirectoryTemplate/package.json index 9828683df7..f49e35d23f 100644 --- a/packages/cli/src/commands/new/appDirectoryTemplate/package.json +++ b/packages/cli/src/commands/new/appDirectoryTemplate/package.json @@ -2,9 +2,6 @@ "name": "name", "version": "1.0.0", "description": "", - "scripts": { - "test": "echo \"Error: no test specified\" && exit 1" - }, "author": "", "license": "ISC", "dependencies": { diff --git a/packages/server/src/api/controllers/model.js b/packages/server/src/api/controllers/model.js index 5eba25d059..4a97cf97aa 100644 --- a/packages/server/src/api/controllers/model.js +++ b/packages/server/src/api/controllers/model.js @@ -39,7 +39,7 @@ exports.create = async function(ctx) { ctx.body = newModel } -exports.update = async function(ctx) {} +exports.update = async function() {} exports.destroy = async function(ctx) { const db = new CouchDB(ctx.params.instanceId) diff --git a/packages/server/src/api/controllers/view.js b/packages/server/src/api/controllers/view.js index 64d3c3b98d..8456837c6a 100644 --- a/packages/server/src/api/controllers/view.js +++ b/packages/server/src/api/controllers/view.js @@ -1,7 +1,7 @@ const CouchDB = require("../../db") const controller = { - query: async ctx => {}, + query: async () => {}, fetch: async ctx => { const db = new CouchDB(ctx.params.instanceId) const designDoc = await db.get("_design/database")