github/directus
1
1
Fork 0
mirror of https://github.com/directus/directus.git synced 2026-04-25 03:00:53 -04:00
Code Issues Packages Projects Releases Wiki Activity

Skip checking of virtual alias fields (#16320)

Browse Source 
* Default virtual fields as alias type

* Make the condition more verbose instead of defaulting

* Remove unnecessary optional chaining

* Add tests

* Revert to alias defaulting in #d06d62

* Shift condition up
This commit is contained in:
ian
2022-11-09 07:49:49 +08:00
committed by GitHub
parent 8d998f662a
commit adff255d91
3 changed files with 117 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
api/src/services/fields.ts
View File

@@ -362,10 +362,10 @@ export class FieldsService {
: null;
if (
hookAdjustedField.type &&
(hookAdjustedField.type === 'alias' ||
this.schema.collections[collection].fields[field.field]?.type === 'alias') &&
hookAdjustedField.type &&
hookAdjustedField.type !== this.schema.collections[collection].fields[field.field]?.type
hookAdjustedField.type !== (this.schema.collections[collection].fields[field.field]?.type ?? 'alias')
) {
throw new InvalidPayloadException('Alias type cannot be changed');
}

4
tests-blackbox/routes/fields/change-fields.seed.ts
View File

@@ -12,8 +12,8 @@ import {
import { CachedTestsSchema, TestsSchema, TestsSchemaVendorValues } from '@query/filter';
import { set } from 'lodash';
export const collectionCountries = 'test_fields_delete_field_countries';
export const collectionStates = 'test_fields_delete_field_states';
export const collectionCountries = 'test_fields_change_field_countries';
export const collectionStates = 'test_fields_change_field_states';
export type Country = {
id?: number | string;

113
tests-blackbox/routes/fields/change-fields.test.ts
View File

@@ -117,6 +117,119 @@ describe.each(common.PRIMARY_KEY_TYPES)('/fields', (pkType) => {
expect(existingData).toStrictEqual(updatedData);
});
});
describe('can create new virtual alias field', () => {
it.each(vendors)('%s', async (vendor) => {
// Setup
const fieldName = 'test_divider';
// Action
const response = await request(getUrl(vendor))
.post(`/fields/${localCollectionCountries}`)
.send({
field: fieldName,
type: 'alias',
meta: {
interface: 'presentation-divider',
special: ['alias', 'no-data'],
options: { title: 'Test Divider' },
},
collection: localCollectionCountries,
})
.set('Authorization', `Bearer ${common.USER.ADMIN.TOKEN}`);
const response2 = await request(getUrl(vendor))
.get(`/fields/${localCollectionCountries}/${fieldName}`)
.set('Authorization', `Bearer ${common.USER.ADMIN.TOKEN}`);
// Assert
expect(response.statusCode).toEqual(200);
expect(response2.statusCode).toEqual(200);
expect(response2.body.data).toEqual(
expect.objectContaining({
field: fieldName,
type: 'alias',
collection: localCollectionCountries,
})
);
});
});
});
describe('PATCH /:collection', () => {
describe('can sort virtual alias field', () => {
it.each(vendors)('%s', async (vendor) => {
// Setup
const fieldName = 'test_divider';
const updatedSort = 100;
// Action
const response = await request(getUrl(vendor))
.patch(`/fields/${localCollectionCountries}`)
.send([{ field: 'test_divider', meta: { sort: updatedSort, group: null } }])
.set('Authorization', `Bearer ${common.USER.ADMIN.TOKEN}`);
const response2 = await request(getUrl(vendor))
.get(`/fields/${localCollectionCountries}/${fieldName}`)
.set('Authorization', `Bearer ${common.USER.ADMIN.TOKEN}`);
// Assert
expect(response.statusCode).toEqual(200);
expect(response2.statusCode).toEqual(200);
expect(response2.body.data).toEqual(
expect.objectContaining({
field: fieldName,
type: 'alias',
meta: expect.objectContaining({
sort: updatedSort,
}),
collection: localCollectionCountries,
})
);
});
});
});
describe('PATCH /:collection/:field', () => {
describe('can update virtual alias field', () => {
it.each(vendors)('%s', async (vendor) => {
// Setup
const fieldName = 'test_divider';
const updatedTitle = 'Updated Divider';
// Action
const response = await request(getUrl(vendor))
.patch(`/fields/${localCollectionCountries}/${fieldName}`)
.send({
collection: localCollectionCountries,
field: fieldName,
type: 'alias',
schema: null,
meta: {
options: { title: updatedTitle },
},
})
.set('Authorization', `Bearer ${common.USER.ADMIN.TOKEN}`);
const response2 = await request(getUrl(vendor))
.get(`/fields/${localCollectionCountries}/${fieldName}`)
.set('Authorization', `Bearer ${common.USER.ADMIN.TOKEN}`);
// Assert
expect(response.statusCode).toEqual(200);
expect(response2.statusCode).toEqual(200);
expect(response2.body.data).toEqual(
expect.objectContaining({
field: fieldName,
type: 'alias',
meta: expect.objectContaining({
options: expect.objectContaining({ title: updatedTitle }),
}),
collection: localCollectionCountries,
})
);
});
});
});
});