yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-11-03 03:17:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into fix/cm-issues

Browse Source
This commit is contained in:
cyril lopez 2020-08-26 08:21:00 +02:00 committed by GitHub
commit 051ee9b468
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 26 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
packages/strapi-admin/admin/src/containers/HomePage/index.js
View File

@ -4,11 +4,12 @@
*
*/
/* eslint-disable */
import React, { memo } from 'react';
import React, { memo, useMemo } from 'react';
import { FormattedMessage } from 'react-intl';
import { get, upperFirst } from 'lodash';
import { auth } from 'strapi-helper-plugin';
import { auth, LoadingIndicatorPage } from 'strapi-helper-plugin';
import PageTitle from '../../components/PageTitle';
import { useModels } from '../../hooks';
import useFetch from './hooks';
import { ALink, Block, Container, LinkWrapper, P, Wave, Separator } from './components';
@ -54,6 +55,9 @@ const SOCIAL_LINKS = [
const HomePage = ({ global: { plugins }, history: { push } }) => {
const { error, isLoading, posts } = useFetch();
// Temporary until we develop the menu API
const { collectionTypes, singleTypes, isLoading: isLoadingForModels } = useModels();
const handleClick = e => {
e.preventDefault();
@ -61,10 +65,18 @@ const HomePage = ({ global: { plugins }, history: { push } }) => {
'/plugins/content-type-builder/content-types/plugins::users-permissions.user?modalType=contentType&kind=collectionType&actionType=create&settingType=base&forTarget=contentType&headerId=content-type-builder.modalForm.contentType.header-create&header_icon_isCustom_1=false&header_icon_name_1=contentType&header_label_1=null'
);
};
const hasAlreadyCreatedContentTypes =
get(plugins, ['content-manager', 'leftMenuSections', '0', 'links'], []).filter(
contentType => contentType.isDisplayed === true
).length > 1;
const hasAlreadyCreatedContentTypes = useMemo(() => {
const filterContentTypes = contentTypes => contentTypes.filter(c => c.isDisplayed);
return (
filterContentTypes(collectionTypes).length > 1 || filterContentTypes(singleTypes).length > 0
);
}, [collectionTypes, singleTypes]);
if (isLoadingForModels) {
return <LoadingIndicatorPage />;
}
const headerId = hasAlreadyCreatedContentTypes
? 'HomePage.greetings'

9
packages/strapi-plugin-content-type-builder/admin/src/components/CreatableSelect/index.js
View File

@ -1,6 +1,7 @@
import React from 'react';
import Creatable from 'react-select/creatable';
import PropTypes from 'prop-types';
import { uniqBy } from 'lodash';
import useDataManager from '../../hooks/useDataManager';
const CreatableSelect = ({ onChange, name, styles, value }) => {
@ -19,7 +20,13 @@ const CreatableSelect = ({ onChange, name, styles, value }) => {
};
const formatOptions = () => {
return allComponentsCategories.map(cat => ({ value: cat, label: cat }));
const options = allComponentsCategories.map(cat => ({ value: cat, label: cat }));
if (value) {
return uniqBy(options.concat({ value, label: value }), 'value');
}
return options;
};
const getValue = () => {