yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-12-16 09:45:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

Edit the content-type btn

Browse Source
This commit is contained in:
Virginie Ky 2019-11-07 16:38:57 +01:00 committed by Alexandre Bodin
parent 952fed3e59
commit 744850a3a5
12 changed files with 138 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
packages/strapi-plugin-content-manager/admin/src/components/Container/index.js
View File

@ -2,9 +2,6 @@ import styled from 'styled-components';
const Container = styled.div`
padding: 18px 30px 18px 30px;
> div:first-child {
margin-bottom: 12px;
}
`;
export default Container;

2
packages/strapi-plugin-content-manager/admin/src/components/LayoutTitle/index.js
View File

@ -6,7 +6,7 @@ const LayoutTitle = styled.div`
font-weight: 500;
line-height: 18px;
> p {
p {
margin-bottom: 29px;
color: #787e8f;
font-weight: 400;

38
packages/strapi-plugin-content-manager/admin/src/components/SettingsViewWrapper/index.js
View File

@ -3,10 +3,9 @@ import PropTypes from 'prop-types';
import { get, isEqual, upperFirst } from 'lodash';
import { withRouter } from 'react-router-dom';
import { FormattedMessage } from 'react-intl';
import { Inputs as Input } from '@buffetjs/custom';
import { Inputs as Input, Header } from '@buffetjs/custom';
import {
BackHeader,
PluginHeader,
LoadingIndicatorPage,
PopUpWarning,
// contexts
@ -32,7 +31,7 @@ const SettingsViewWrapper = ({
onConfirmSubmit,
slug,
}) => {
const { emitEvent } = useGlobalContext();
const { emitEvent, formatMessage } = useGlobalContext();
const [showWarningCancel, setWarningCancel] = useState(false);
const [showWarningSubmit, setWarningSubmit] = useState(false);
@ -50,30 +49,38 @@ const SettingsViewWrapper = ({
return [
{
label: `${pluginId}.popUpWarning.button.cancel`,
kind: 'secondary',
color: 'cancel',
onClick: toggleWarningCancel,
title: formatMessage({
id: `${pluginId}.popUpWarning.button.cancel`,
}),
type: 'button',
},
{
kind: 'primary',
label: `${pluginId}.containers.Edit.submit`,
color: 'success',
title: formatMessage({
id: `${pluginId}.containers.Edit.submit`,
}),
type: 'submit',
},
];
};
const pluginHeaderProps = {
const headerProps = {
actions: getPluginHeaderActions(),
title: {
label: formatMessage(
{
id: `${pluginId}.components.SettingsViewWrapper.pluginHeader.title`,
values: { name: upperFirst(slug) },
},
description: {
{ name: upperFirst(slug) }
),
},
content: formatMessage({
id: `${pluginId}.components.SettingsViewWrapper.pluginHeader.description.${
isEditSettings ? 'edit' : 'list'
}-settings`,
},
}),
};
const getSelectOptions = input => {
@ -129,8 +136,13 @@ const SettingsViewWrapper = ({
<BackHeader onClick={goBack} />
<Container className="container-fluid">
<form onSubmit={handleSubmit}>
<PluginHeader {...pluginHeaderProps} />
<div className="row">
<Header {...headerProps} />
<div
className="row"
style={{
paddingTop: '3px',
}}
>
<Block
style={{
marginBottom: '13px',

29
packages/strapi-plugin-content-manager/admin/src/containers/EditSettingsView/index.js
View File

@ -29,15 +29,18 @@ import SortableList from '../../components/SortableList';
import { unformatLayout } from '../../utils/layout';
import LayoutDndProvider from '../LayoutDndProvider';
import getInputProps from './utils/getInputProps';
import getInjectedComponents from '../../utils/getComponents';
import reducer, { initialState } from './reducer';
const EditSettingsView = ({
currentEnvironment,
deleteLayout,
deleteLayouts,
componentsAndModelsMainPossibleMainFields,
history: { push },
location: { search },
plugins,
slug,
}) => {
const { componentSlug, type } = useParams();
@ -379,10 +382,34 @@ const EditSettingsView = ({
>
<div className="row">
<LayoutTitle className={fieldsReorderClassName}>
<div
style={{
display: 'flex',
justifyContent: 'space-between',
}}
>
<div>
<FormTitle
title={`${pluginId}.global.displayedFields`}
description={`${pluginId}.containers.SettingPage.editSettings.description`}
/>
</div>
<div
style={{
marginTop: -6,
}}
>
{getInjectedComponents(
'left.links',
plugins,
currentEnvironment,
slug,
source,
emitEvent,
push
)}
</div>
</div>
</LayoutTitle>
{type !== 'components' && (
<LayoutTitle className="col-4">
@ -445,6 +472,7 @@ EditSettingsView.defaultProps = {
};
EditSettingsView.propTypes = {
currentEnvironment: PropTypes.string,
deleteLayout: PropTypes.func.isRequired,
deleteLayouts: PropTypes.func,
componentsAndModelsMainPossibleMainFields: PropTypes.object.isRequired,
@ -454,6 +482,7 @@ EditSettingsView.propTypes = {
location: PropTypes.shape({
search: PropTypes.string.isRequired,
}).isRequired,
plugins: PropTypes.object,
slug: PropTypes.string,
};

2
packages/strapi-plugin-content-manager/admin/src/containers/EditView/Header.js
View File

@ -57,7 +57,7 @@ const Header = () => {
type: 'button',
},
{
color: 'primary',
color: 'success',
title: formatMessage({
id: `${pluginId}.containers.Edit.submit`,
}),

7
packages/strapi-plugin-content-manager/admin/src/containers/EditView/index.js
View File

@ -20,9 +20,9 @@ import SelectWrapper from '../../components/SelectWrapper';
import EditViewDataManagerProvider from '../EditViewDataManagerProvider';
import EditViewProvider from '../EditViewProvider';
import Header from './Header';
import getInjectedComponents from './utils/getComponents';
import createAttributesLayout from './utils/createAttributesLayout';
import { LinkWrapper, SubWrapper } from './components';
import getInjectedComponents from '../../utils/getComponents';
import init from './init';
import reducer, { initialState } from './reducer';
@ -152,7 +152,7 @@ const EditView = ({
<BackHeader onClick={() => redirectToPreviousPage()} />
<Container className="container-fluid">
<Header />
<div className="row">
<div className="row" style={{ paddingTop: 13 }}>
<div className="col-md-12 col-lg-9">
{formattedContentTypeLayout.map((block, blockIndex) => {
if (isDynamicZone(block)) {
@ -285,7 +285,8 @@ const EditView = ({
currentEnvironment,
slug,
source,
emitEvent
emitEvent,
true
)}
</ul>
</LinkWrapper>

2
packages/strapi-plugin-content-manager/admin/src/containers/ListView/components.js
View File

@ -4,7 +4,7 @@ import { Button } from 'strapi-helper-plugin';
import RemoveIcon from '../../assets/images/icon-cross-blue.svg';
const Wrapper = styled.div`
padding-top: 19px;
padding-top: 1px;
`;
const AddFilterCta = styled(Button)`

1
packages/strapi-plugin-content-manager/admin/src/translations/en.json
View File

@ -57,6 +57,7 @@
"containers.Edit.submit": "Save",
"containers.Edit.Link.Layout": "Configure the layout",
"containers.Edit.Link.Fields": "Edit the fields",
"containers.Edit.Link.Model": "Edit the content-type",
"containers.EditView.notification.errors": "The form contains some errors",
"containers.Home.introduction": "To edit your entries go to the specific link in the left menu. This plugin doesn't have a proper way to edit settings and it's still under active development.",
"containers.Home.pluginHeaderDescription": "Manage your entries through a powerful and beautiful interface.",

1
packages/strapi-plugin-content-manager/admin/src/translations/fr.json
View File

@ -57,6 +57,7 @@
"containers.EditView.notification.errors": "Le formulaire contient des erreurs",
"containers.Edit.Link.Layout": "Paramétrer la vue",
"containers.Edit.Link.Fields": "Éditer le modèle",
"containers.Edit.Link.Model": "Éditer le modèle",
"containers.Home.introduction": "Pour éditer du contenu, choisissez un type de données dans le menu de gauche.",
"containers.Home.pluginHeaderDescription": "Créer et modifier votre type de contenu",
"containers.Home.pluginHeaderTitle": "Type de contenu",

6
packages/strapi-plugin-content-manager/admin/src/containers/EditView/utils/getComponents.js → packages/strapi-plugin-content-manager/admin/src/utils/getComponents.js
View File

@ -1,6 +1,6 @@
import React from 'react';
import { get } from 'lodash';
import pluginId from '../../../pluginId';
import pluginId from '../pluginId';
/**
* Retrieve external links from injected components
@ -12,7 +12,8 @@ const getInjectedComponents = (
currentEnvironment,
slug,
source,
emitEvent
emitEvent,
push
) => {
const componentsToInject = Object.keys(plugins).reduce((acc, current) => {
// Retrieve injected compos from plugin
@ -35,6 +36,7 @@ const getInjectedComponents = (
getContentTypeBuilderBaseUrl={() =>
'/plugins/content-type-builder/models/'
}
push={push}
{...compo.props}
key={compo.key}
onClick={() => {

59
packages/strapi-plugin-content-type-builder/admin/src/InjectedComponents/ContentManager/EditViewButton.js Normal file
View File

@ -0,0 +1,59 @@
/**
*
* EditViewButton
*
*/
import React from 'react';
import PropTypes from 'prop-types';
import { useGlobalContext } from 'strapi-helper-plugin';
import { Button } from '@buffetjs/core';
// Create link from content-type-builder to content-manager
function EditViewButton(props) {
const { formatMessage } = useGlobalContext();
// Retrieve URL from props
const base = `${props.getContentTypeBuilderBaseUrl()}${props.getModelName()}`;
const url =
props.getSource() === 'users-permissions'
? `${base}&source=${props.getSource()}`
: base;
const handleClick = () => {
props.push(url);
};
if (props.getSource() === 'admin') {
return null;
}
if (props.currentEnvironment === 'development') {
return (
<Button
{...props}
onClick={handleClick}
icon={<i className="fa fa-cog"></i>}
label={formatMessage({
id: 'content-manager.containers.Edit.Link.Model',
})}
style={{
paddingLeft: 15,
paddingRight: 15,
outline: 0,
}}
></Button>
);
}
return null;
}
EditViewButton.propTypes = {
currentEnvironment: PropTypes.string.isRequired,
getContentTypeBuilderBaseUrl: PropTypes.func.isRequired,
getModelName: PropTypes.func.isRequired,
getSource: PropTypes.func.isRequired,
push: PropTypes.func.isRequired,
};
export default EditViewButton;

8
packages/strapi-plugin-content-type-builder/admin/src/index.js
View File

@ -4,6 +4,7 @@ import pluginPkg from '../../package.json';
import App from './containers/App';
import Initializer from './containers/Initializer';
import Link from './InjectedComponents/ContentManager/EditViewLink';
import Button from './InjectedComponents/ContentManager/EditViewButton';
import lifecycles from './lifecycles';
import trads from './translations';
import pluginId from './pluginId';
@ -34,6 +35,12 @@ const plugin = {
icon: 'fa-cog',
},
},
{
plugin: 'content-manager.editPage',
area: 'left.links',
component: Button,
key: 'content-type-builder.form',
},
],
layout: null,
lifecycles,
@ -53,7 +60,6 @@ const plugin = {
? `/models/${uid}&source=${source}`
: `/models/${uid}`;
},
trads,
};