diff --git a/packages/builder/src/components/design/PropertiesPanel/PropertyControls/PropertyGroup.svelte b/packages/builder/src/components/design/PropertiesPanel/PropertyControls/PropertyGroup.svelte
index b04954c06f..93be958d55 100644
--- a/packages/builder/src/components/design/PropertiesPanel/PropertyControls/PropertyGroup.svelte
+++ b/packages/builder/src/components/design/PropertiesPanel/PropertyControls/PropertyGroup.svelte
@@ -25,7 +25,7 @@
{#if open}
- {#each properties as prop (`${componentInstance._id}-${prop.key}`)}
+ {#each properties as prop (`${componentInstance._id}-${prop.key}-${prop.label}`)}
{
@@ -37,8 +37,8 @@ describe("/queries", () => {
let query
beforeAll(async () => {
- ({ request, server } = await supertest())
- });
+ ;({ request, server } = await supertest())
+ })
afterAll(() => {
server.close()
@@ -47,7 +47,7 @@ describe("/queries", () => {
beforeEach(async () => {
app = await createApplication(request)
appId = app.instance._id
- });
+ })
async function createDatasource() {
return await insertDocument(appId, TEST_DATASOURCE)
@@ -63,65 +63,68 @@ describe("/queries", () => {
.post(`/api/queries`)
.send(TEST_QUERY)
.set(defaultHeaders(appId))
- .expect('Content-Type', /json/)
+ .expect("Content-Type", /json/)
.expect(200)
- expect(res.res.statusMessage).toEqual(`Query ${TEST_QUERY.name} saved successfully.`);
- expect(res.body).toEqual({
- _rev: res.body._rev,
- ...TEST_QUERY,
- });
+ expect(res.res.statusMessage).toEqual(
+ `Query ${TEST_QUERY.name} saved successfully.`
+ )
+ expect(res.body).toEqual({
+ _rev: res.body._rev,
+ ...TEST_QUERY,
})
- });
+ })
+ })
describe("fetch", () => {
let datasource
beforeEach(async () => {
datasource = await createDatasource()
- });
+ })
afterEach(() => {
delete datasource._rev
- });
+ })
it("returns all the queries from the server", async () => {
const query = await createQuery()
const res = await request
.get(`/api/queries`)
.set(defaultHeaders(appId))
- .expect('Content-Type', /json/)
+ .expect("Content-Type", /json/)
.expect(200)
- const queries = res.body;
- expect(queries).toEqual([
- {
- "_rev": query.rev,
- ...TEST_QUERY
- }
- ]);
+ const queries = res.body
+ expect(queries).toEqual([
+ {
+ _rev: query.rev,
+ ...TEST_QUERY,
+ readable: true,
+ },
+ ])
})
it("should apply authorization to endpoint", async () => {
- await builderEndpointShouldBlockNormalUsers({
- request,
- method: "GET",
- url: `/api/datasources`,
- appId: appId,
- })
+ await builderEndpointShouldBlockNormalUsers({
+ request,
+ method: "GET",
+ url: `/api/datasources`,
+ appId: appId,
})
- });
+ })
+ })
describe("destroy", () => {
- let datasource;
+ let datasource
beforeEach(async () => {
datasource = await createDatasource()
- });
+ })
afterEach(() => {
delete datasource._rev
- });
+ })
it("deletes a query and returns a success message", async () => {
const query = await createQuery()
@@ -134,10 +137,10 @@ describe("/queries", () => {
const res = await request
.get(`/api/queries`)
.set(defaultHeaders(appId))
- .expect('Content-Type', /json/)
+ .expect("Content-Type", /json/)
.expect(200)
-
- expect(res.body).toEqual([])
+
+ expect(res.body).toEqual([])
})
it("should apply authorization to endpoint", async () => {
@@ -148,5 +151,5 @@ describe("/queries", () => {
appId: appId,
})
})
- });
-});
+ })
+})
diff --git a/packages/server/src/db/linkedRows/LinkController.js b/packages/server/src/db/linkedRows/LinkController.js
index 061a9ac1ae..dd55ed898f 100644
--- a/packages/server/src/db/linkedRows/LinkController.js
+++ b/packages/server/src/db/linkedRows/LinkController.js
@@ -138,6 +138,13 @@ class LinkController {
// iterate through the link IDs in the row field, see if any don't exist already
for (let linkId of rowField) {
if (linkId && linkId !== "" && linkDocIds.indexOf(linkId) === -1) {
+ // first check the doc we're linking to exists
+ try {
+ await this._db.get(linkId)
+ } catch (err) {
+ // skip links that don't exist
+ continue
+ }
operations.push(
new LinkDocument(
table._id,
diff --git a/packages/standard-components/manifest.json b/packages/standard-components/manifest.json
index 5694e3c5b3..cbebe1986c 100644
--- a/packages/standard-components/manifest.json
+++ b/packages/standard-components/manifest.json
@@ -1294,12 +1294,6 @@
"type": "text",
"label": "Label",
"key": "label"
- },
- {
- "type": "text",
- "label": "Placeholder",
- "key": "placeholder",
- "placeholder": "Choose an option"
}
]
}