Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Feat: Add private option field for relations #8149

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -331,6 +331,7 @@ const forms = {
const nameValue = get(data, 'name', null);
const relationItems = [
[fields.divider],
[fields.private],
[fields.unique],
[
{
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
import fields from '../forms';

describe('forms', () => {
it('should contain private field in relation input type', () => {
const { items } = fields.attribute.form.advanced({}, 'relation', null);

expect(
items.find(relationItem => relationItem.find(item => item.name === 'private')).length
).toBeTruthy();
});
});
Original file line number Diff line number Diff line change
Expand Up @@ -189,4 +189,47 @@ describe('Content Type Builder - Content types', () => {
expect(updateRes.body.error).toMatch('multiple entries in DB');
});
});

describe('Private relation field', () => {
const singleTypeUID = 'application::test-single-type.test-single-type';

test('should add a relation field', async () => {
const res = await rq({
method: 'PUT',
url: `/content-type-builder/content-types/${singleTypeUID}`,
body: {
contentType: {
kind: 'singleType',
name: 'test-collection',
attributes: {
relation: {
private: true,
nature: 'oneWay',
target: 'plugins::users-permissions.user',
targetAttribute: 'test',
},
},
},
},
});

expect(res.statusCode).toBe(201);
expect(res.body).toEqual({
data: {
uid: singleTypeUID,
},
});
});

test('should contain a private relation field', async () => {
const res = await rq({
method: 'GET',
url: `/content-type-builder/content-types/${singleTypeUID}`,
});

expect(res.statusCode).toBe(200);
expect(res.body.data.schema.attributes.relation).toBeDefined();
expect(res.body.data.schema.attributes.relation.private).toBeTruthy();
});
});
});
Original file line number Diff line number Diff line change
Expand Up @@ -85,6 +85,7 @@ const formatAttribute = (key, attribute, { model }) => {
['attributes', attribute.via, 'columnName'],
undefined
),
private: attribute.private ? true : false,
unique: attribute.unique ? true : false,
autoPopulate: attribute.autoPopulate,
};
Expand Down