yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-09-10 00:58:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

Handle updating list sortable flag

Browse Source
This commit is contained in:
Alexandre Bodin 2019-07-22 21:27:21 +02:00
parent e68f230baa
commit 1e37ff5b47
1 changed files with 20 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
packages/strapi-plugin-content-manager/config/functions/bootstrap.js vendored
View File

@ -56,7 +56,10 @@ async function buildDefaultSettings() {
} }
const NON_SORTABLES = ['group', 'json', 'array']; const NON_SORTABLES = ['group', 'json', 'array'];
const isSortable = attribute => { const isSortable = (model, name) => {
if (name === 'id') return true;
const attribute = model.allAttributes[name];
if (!_.has(attribute, 'type')) { if (!_.has(attribute, 'type')) {
return false; return false;
} }
@ -78,7 +81,7 @@ function buildDefaultMetadata(model, name) {
description: '', description: '',
placeholder: '', placeholder: '',
visible: true, // TODO: depends on the type ? visible: true, // TODO: depends on the type ?
editable: isEditable(attr), editable: isEditable(model, name),
}; };
if (_.has(attr, 'model') || _.has(attr, 'collection')) { if (_.has(attr, 'model') || _.has(attr, 'collection')) {
@ -88,7 +91,7 @@ function buildDefaultMetadata(model, name) {
const list = { const list = {
label: name, label: name,
searchable: true, searchable: true,
sortable: isSortable(attr), sortable: isSortable(model, name),
}; };
return { edit, list }; return { edit, list };
@ -278,15 +281,21 @@ async function updateMetadatas(configuration, model) {
// clear the invalid mainFields // clear the invalid mainFields
const updatedMetas = Object.keys(metasWithDefaults).reduce((acc, key) => { const updatedMetas = Object.keys(metasWithDefaults).reduce((acc, key) => {
const meta = metasWithDefaults[key]; const meta = metasWithDefaults[key];
const { edit } = meta; const { edit, list } = meta;
let updatedMeta = { edit, list };
// update sortable attr
if (list.sortable && !isSortable(model, key)) {
_.set(updatedMeta, ['list', 'sortable'], false);
_.set(acc, [key], updatedMeta);
}
if (!_.has(edit, 'mainField')) return acc; if (!_.has(edit, 'mainField')) return acc;
// remove mainField if the attribute is not a relation anymore // remove mainField if the attribute is not a relation anymore
if (_.has(model.allAttributes[key], 'type')) { if (_.has(model.allAttributes[key], 'type')) {
acc[key] = { _.set(updatedMeta, 'edit', _.omit(edit, ['mainField']));
...meta, _.set(acc, [key], updatedMeta);
edit: _.omit(edit, ['mainField']),
};
return acc; return acc;
} }
@ -298,15 +307,11 @@ async function updateMetadatas(configuration, model) {
const target = strapi.getModel(attr.model || attr.collection, attr.plugin); const target = strapi.getModel(attr.model || attr.collection, attr.plugin);
if (!hasListableAttribute(target, meta.mainField)) { if (!hasListableAttribute(target, meta.mainField)) {
acc[key] = { _.set(updatedMeta, ['edit', 'mainField'], 'id');
...meta, _.set(acc, [key], updatedMeta);
edit: {
...edit,
mainField: 'id',
},
};
return acc; return acc;
} }
return acc; return acc;
}, {}); }, {});