From 40eb59acc35375b09dbad6ef9e60e0db830f6ba6 Mon Sep 17 00:00:00 2001 From: henrych4 Date: Wed, 21 Nov 2018 21:36:48 +0800 Subject: [PATCH 1/2] fix missing content type in content manager --- .../admin/src/containers/SettingsPage/index.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/strapi-plugin-content-manager/admin/src/containers/SettingsPage/index.js b/packages/strapi-plugin-content-manager/admin/src/containers/SettingsPage/index.js index f3d041871a..e821555aa9 100644 --- a/packages/strapi-plugin-content-manager/admin/src/containers/SettingsPage/index.js +++ b/packages/strapi-plugin-content-manager/admin/src/containers/SettingsPage/index.js @@ -42,13 +42,13 @@ class SettingsPage extends React.PureComponent { if (curr !== 'plugins') { if (!data[curr].fields && _.isObject(data[curr])) { - return this.getModels(data[curr], `${destination}${curr}/`); + return acc.concat(this.getModels(data[curr], `${destination}${curr}/`)); } return acc.concat([{ name: curr, destination: `${destination}${curr}` }]); } - return this.getModels(data[curr], `${destination}${curr}/`); + return acc.concat(this.getModels(data[curr], `${destination}${curr}/`)); }, []); return sortBy( From 84921e3f76e4eb325ddfb239d65b6f401d79cd70 Mon Sep 17 00:00:00 2001 From: henrych4 Date: Tue, 27 Nov 2018 20:55:25 +0800 Subject: [PATCH 2/2] display a content type based on layout schema --- .../admin/src/containers/SettingsPage/index.js | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/packages/strapi-plugin-content-manager/admin/src/containers/SettingsPage/index.js b/packages/strapi-plugin-content-manager/admin/src/containers/SettingsPage/index.js index e821555aa9..e427801d01 100644 --- a/packages/strapi-plugin-content-manager/admin/src/containers/SettingsPage/index.js +++ b/packages/strapi-plugin-content-manager/admin/src/containers/SettingsPage/index.js @@ -1,5 +1,5 @@ /** - * + * * SettingsPage */ @@ -36,23 +36,23 @@ class SettingsPage extends React.PureComponent { componentWillUnmount() { this.props.onReset(); } - + getModels = (data = this.props.schema.models, destination = '/') => { const models = Object.keys(data).reduce((acc, curr) => { if (curr !== 'plugins') { - + if (!data[curr].fields && _.isObject(data[curr])) { return acc.concat(this.getModels(data[curr], `${destination}${curr}/`)); } - + return acc.concat([{ name: curr, destination: `${destination}${curr}` }]); - } - + } + return acc.concat(this.getModels(data[curr], `${destination}${curr}/`)); }, []); return sortBy( - models.filter(obj => obj.name !== 'permission' && obj.name !== 'role'), + models.filter(obj => !!this.props.schema.layout[obj.name]), ['name'], ); }