yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-10-27 08:02:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'webhooks/tests' of github.com:strapi/strapi into webhooks/tests

Browse Source 
Signed-off-by: Virginie Ky <virginie.ky@gmail.com>
This commit is contained in:
Virginie Ky 2020-01-22 18:11:12 +01:00
commit ab85b7642e
199 changed files with 5740 additions and 843 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.eslintignore
View File

@ -2,4 +2,7 @@
**/build/**
**/dist/**
testApp/**
packages/strapi-plugin-users-permissions/admin/**
packages/strapi-plugin-upload/admin/**
packages/strapi-generate-plugin/files/admin/src/**
.eslintrc.js

83
.eslintrc.js
View File

@ -4,10 +4,9 @@ module.exports = {
'eslint:recommended',
'plugin:react/recommended',
'plugin:redux-saga/recommended',
'prettier',
],
plugins: ['react', 'redux-saga', 'react-hooks', 'import'],
plugins: ['react', 'redux-saga', 'react-hooks', 'import', 'jsx-a11y'],
env: {
browser: true,
commonjs: true,
@ -54,9 +53,87 @@ module.exports = {
overrides: [
{
files: ['packages/**/admin/src/**/**/*.js'],
extends: ['airbnb'],
rules: {
'no-nested-ternary': ['error'],
'arrow-body-style': 0,
'arrow-parens': 0,
camelcase: 0,
'comma-dangle': 0,
'consistent-return': [
2,
{
treatUndefinedAsUnspecified: true,
},
],
indent: [
2,
2,
{
flatTernaryExpressions: false,
SwitchCase: 1,
ignoredNodes: [
'ConditionalExpression',
"VariableDeclarator[kind='const']",
],
},
],
'func-names': ['error', 'never'],
'function-paren-newline': 0,
'implicit-arrow-linebreak': 0,
'import/no-extraneous-dependencies': 0,
'import/no-named-as-default': 0,
'import/order': 2,
'jsx-a11y/click-events-have-key-events': 1,
'max-len': [
2,
{
code: 120,
ignoreComments: true,
ignoreUrls: true,
ignoreTrailingComments: true,
ignoreStrings: true,
ignoreTemplateLiterals: true,
},
],
'newline-before-return': 2,
'no-confusing-arrow': 0,
'no-else-return': 1,
'no-nested-ternary': ['error'],
'no-return-assign': 0,
'no-param-reassign': 0,
'no-shadow': 0,
'no-underscore-dangle': 0,
'no-use-before-define': [
'error',
{ functions: false, classes: false, variables: false },
],
'object-curly-newline': [2, { multiline: true, consistent: true }],
'operator-linebreak': 0,
'padding-line-between-statements': [
'error',
{ blankLine: 'always', prev: '*', next: 'if' },
{ blankLine: 'any', prev: 'block-like', next: 'if' },
],
'prefer-arrow-callback': 0,
'prefer-const': 0,
'prefer-destructuring': 0,
'prefer-object-spread': 0,
'prefer-spread': 0,
'space-before-function-paren': [
'error',
{
anonymous: 'never',
named: 'never',
asyncArrow: 'always',
},
],
'react/destructuring-assignment': 0,
'react/jsx-filename-extension': [1, { extensions: ['.js', '.jsx'] }],
'react/forbid-prop-types': 0,
'react/jsx-props-no-spreading': 0,
'react/jsx-one-expression-per-line': 0,
'react/state-in-constructor': 0,
'react/static-property-placement': 0,
},
},
],

4
codecov.yml
View File

@ -1,2 +1,4 @@
comment:
branch: master
branches:
- master
- develop

6
examples/getstarted/api/restaurant/models/Restaurant.settings.json
View File

@ -81,10 +81,10 @@
"dz": {
"type": "dynamiczone",
"components": [
"default.closingperiod",
"default.dish",
"default.openingtimes",
"default.restaurantservice"
"default.restaurantservice",
"default.closingperiod",
"default.dish"
]
}
}

4
package.json
View File

@ -11,8 +11,11 @@
"enzyme": "^3.9.0",
"enzyme-adapter-react-16": "^1.12.1",
"eslint": "^6.3.0",
"eslint-config-airbnb": "^18.0.1",
"eslint-config-airbnb-base": "^14.0.0",
"eslint-config-prettier": "^6.2.0",
"eslint-plugin-import": "^2.19.1",
"eslint-plugin-jsx-a11y": "^6.2.3",
"eslint-plugin-react": "^7.14.0",
"eslint-plugin-react-hooks": "^2.0.0",
"eslint-plugin-redux-saga": "^1.1.0",
@ -38,6 +41,7 @@
"build": "lerna run --stream build --no-private",
"lint": "npm-run-all -p lint:code",
"lint:code": "eslint .",
"lint:fix": "eslint --fix .",
"lint:other": "npm run prettier:other -- --check",
"format": "npm-run-all -p format:*",
"format:code": "npm run prettier:code -- --write",

2
packages/strapi-admin/admin/src/app.js
View File

@ -5,6 +5,8 @@
// * Entry point of the application
// */
/* eslint-disable */
import '@babel/polyfill';
import 'sanitize.css/sanitize.css';

7
packages/strapi-admin/admin/src/components/EmptyList/index.js
View File

@ -11,16 +11,17 @@ import Wrapper from './Wrapper';
function EmptyList() {
const { formatMessage } = useGlobalContext();
return (
<Wrapper>
<p>{formatMessage({ id: `Settings.webhooks.list.empty.title` })}</p>
<p>{formatMessage({ id: `Settings.webhooks.list.empty.description` })}</p>
<p>{formatMessage({ id: 'Settings.webhooks.list.empty.title' })}</p>
<p>{formatMessage({ id: 'Settings.webhooks.list.empty.description' })}</p>
<a
href="https://strapi.io/documentation/3.0.0-beta.x/guides/webhooks.html"
target="_blank"
rel="noopener noreferrer"
>
{formatMessage({ id: `Settings.webhooks.list.empty.link` })}
{formatMessage({ id: 'Settings.webhooks.list.empty.link' })}
</a>
</Wrapper>
);

22
packages/strapi-admin/admin/src/components/EventInput/index.js
View File

@ -7,9 +7,9 @@ import EventRow from './EventRow';
const EventInput = ({ onChange, name: inputName, value: inputValue }) => {
const headersName = [
`Settings.webhooks.events.create`,
`Settings.webhooks.events.edit`,
`Settings.webhooks.events.delete`,
'Settings.webhooks.events.create',
'Settings.webhooks.events.edit',
'Settings.webhooks.events.delete',
];
const events = {
@ -22,6 +22,7 @@ const EventInput = ({ onChange, name: inputName, value: inputValue }) => {
const formatValue = inputValue.reduce((acc, curr) => {
const key = curr.split('.')[0];
if (!acc[key]) {
acc[key] = [];
}
@ -32,6 +33,7 @@ const EventInput = ({ onChange, name: inputName, value: inputValue }) => {
const handleChange = ({ target: { name, value } }) => {
let set = new Set(inputValue);
if (value) {
set.add(name);
} else {
@ -42,14 +44,15 @@ const EventInput = ({ onChange, name: inputName, value: inputValue }) => {
const handleChangeAll = ({ target: { name, value } }) => {
let set = new Set(inputValue);
if (value) {
events[name].map(event => {
events[name].forEach(event => {
if (!disabledEvents.includes(event)) {
set.add(event);
}
});
} else {
events[name].map(event => set.delete(event));
events[name].forEach(event => set.delete(event));
}
onChange({ target: { name: inputName, value: Array.from(set) } });
};
@ -59,7 +62,7 @@ const EventInput = ({ onChange, name: inputName, value: inputValue }) => {
<table>
<thead>
<tr>
<td></td>
<td />
{headersName.map(header => {
return (
<td key={header}>
@ -89,15 +92,12 @@ const EventInput = ({ onChange, name: inputName, value: inputValue }) => {
);
};
EventInput.defaultProps = {
onBlur: () => {},
};
EventInput.defaultProps = {};
EventInput.propTypes = {
name: PropTypes.string.isRequired,
onBlur: PropTypes.func,
onChange: PropTypes.func.isRequired,
value: PropTypes.array,
value: PropTypes.array.isRequired,
};
export default EventInput;

4
packages/strapi-admin/admin/src/components/HeadersInput/index.js
View File

@ -11,8 +11,10 @@ import getBorderColor from './utils/getBorderColor';
import keys from './keys';
import Wrapper from './Wrapper';
/* eslint-disable react/no-array-index-key */
const HeadersInput = ({ errors, name, onClick, onChange, onRemove, value }) => {
const formatOption = value => ({ value: value, label: value });
const formatOption = value => ({ value, label: value });
const options = keys.map(key => formatOption(key));
const handleChangeKey = (selected, name) => {

1
packages/strapi-admin/admin/src/components/HeadersInput/utils/getBorderColor.js
View File

@ -5,6 +5,7 @@ const getBorderColor = ({ isFocused = false, hasError = false }) => {
if (hasError) {
return '#F64D0A';
}
return '#E3E9F3';
};

4
packages/strapi-admin/admin/src/components/LeftMenuFooter/index.js
View File

@ -7,12 +7,10 @@
import React from 'react';
import { defineMessages, FormattedMessage } from 'react-intl';
import { PropTypes } from 'prop-types';
import LeftMenuLink from '../LeftMenuLink';
import Wrapper from './Wrapper';
import messages from './messages.json';
defineMessages(messages);
function LeftMenuFooter({ version, ...rest }) {

2
packages/strapi-admin/admin/src/components/LeftMenuLink/index.js
View File

@ -13,6 +13,8 @@ import { FontAwesomeIcon } from '@fortawesome/react-fontawesome';
import en from '../../translations/en.json';
import Li from './Li';
/* eslint-disable */
function LeftMenuLink(props) {
const isLinkActive = startsWith(
props.location.pathname.replace('/admin', '').concat('/'),

3
packages/strapi-admin/admin/src/components/LeftMenuLinkContainer/index.js
View File

@ -8,11 +8,12 @@ import React from 'react';
import PropTypes from 'prop-types';
import { FormattedMessage } from 'react-intl';
import { get, snakeCase, isEmpty, map, sortBy } from 'lodash';
import LeftMenuLink from '../LeftMenuLink';
import Wrapper from './Wrapper';
import messages from './messages.json';
/* eslint-disable */
function LeftMenuLinkContainer({ plugins, ...rest }) {
// Generate the list of sections
const pluginsSections = Object.keys(plugins).reduce((acc, current) => {

2
packages/strapi-admin/admin/src/components/ListPlugins/index.js
View File

@ -15,6 +15,8 @@ import { Button } from 'strapi-helper-plugin';
import Row from '../Row';
import Wrapper from './Wrapper';
/* eslint-disable react/prefer-stateless-function */
class ListPlugins extends React.Component {
render() {
const listSize = size(this.props.plugins);

8
packages/strapi-admin/admin/src/components/ListRow/index.js
View File

@ -55,12 +55,16 @@ function ListRow({
<p title={url}>{url}</p>
</td>
<td>
<div onClick={e => e.stopPropagation()}>
<div
onClick={e => e.stopPropagation()}
role="button"
aria-hidden="true"
>
<Switch
name={name}
value={isEnabled}
onChange={({ target: { value } }) => onEnabledChange(value, id)}
></Switch>
/>
</div>
</td>
<td>

2
packages/strapi-admin/admin/src/components/Notification/index.js
View File

@ -3,7 +3,7 @@
* Notification
*
*/
/* eslint-disable */
import React from 'react';
import PropTypes from 'prop-types';
import { FormattedMessage } from 'react-intl';

2
packages/strapi-admin/admin/src/components/NotificationsContainer/index.js
View File

@ -11,6 +11,8 @@ import { CSSTransition } from 'react-transition-group';
import Notification from '../Notification';
import Wrapper from './Wrapper';
/* eslint-disable */
const NotificationsContainer = ({ notifications, onHideNotification }) => {
if (notifications.length === 0) {
return false;

2
packages/strapi-admin/admin/src/components/OnboardingVideo/index.js
View File

@ -13,6 +13,8 @@ import { Player } from 'video-react';
import 'video-react/dist/video-react.css';
import Li from './Li';
/* eslint-disable */
class OnboardingVideo extends React.Component {
componentDidMount() {
this.hiddenPlayer.current.subscribeToStateChange(this.handleChangeState);

2
packages/strapi-admin/admin/src/components/Row/index.js
View File

@ -22,6 +22,8 @@ import Content from './Content';
const PLUGINS_WITH_CONFIG = ['email', 'upload'];
/* eslint-disable */
class Row extends React.Component {
static contextType = GlobalContext;
state = { showModal: false };

7
packages/strapi-admin/admin/src/components/Switch/index.js
View File

@ -20,12 +20,11 @@ function Switch({ name, value, onChange }) {
checked={value}
name={name}
onChange={({ target: { checked } }) =>
onChange({ target: { name, value: checked } })
}
onChange({ target: { name, value: checked } })}
/>
<div className="button">
<div className="button-rect"></div>
<div className="button-circle"></div>
<div className="button-rect" />
<div className="button-circle" />
</div>
<p>
{value

26
packages/strapi-admin/admin/src/containers/Admin/index.js
View File

@ -52,6 +52,14 @@ import Content from './Content';
export class Admin extends React.Component {
// eslint-disable-line react/prefer-stateless-function
helpers = {
updatePlugin: this.props.updatePlugin,
};
componentDidMount() {
this.props.emitEvent('didAccessAuthenticatedAdministration');
}
shouldComponentUpdate(prevProps) {
return !isEmpty(difference(prevProps, this.props));
}
@ -70,10 +78,6 @@ export class Admin extends React.Component {
this.props.setAppError();
}
componentDidMount() {
this.props.emitEvent('didAccessAuthenticatedAdministration');
}
hasApluginNotReady = props => {
const {
global: { plugins },
@ -84,10 +88,6 @@ export class Admin extends React.Component {
);
};
helpers = {
updatePlugin: this.props.updatePlugin,
};
/**
* Display the app loader until the app is ready
* @returns {Boolean}
@ -135,10 +135,10 @@ export class Admin extends React.Component {
// We need the admin data in order to make the initializers work
if (this.showLoader()) {
return (
<React.Fragment>
<>
{this.renderInitializers()}
<LoadingIndicatorPage />
</React.Fragment>
</>
);
}
@ -202,6 +202,12 @@ export class Admin extends React.Component {
}
}
Admin.defaultProps = {
intl: {
formatMessage: () => {},
},
};
Admin.propTypes = {
admin: PropTypes.shape({
appError: PropTypes.bool,

1
packages/strapi-admin/admin/src/containers/App/index.js
View File

@ -23,6 +23,7 @@ import GlobalStyle from '../../components/GlobalStyle';
import Admin from '../Admin';
import AuthPage from '../AuthPage';
import NotFoundPage from '../NotFoundPage';
// eslint-disable-next-line import/no-cycle
import NotificationProvider from '../NotificationProvider';
import PrivateRoute from '../PrivateRoute';
import Theme from '../Theme';

2
packages/strapi-admin/admin/src/containers/AuthPage/Input.js
View File

@ -6,6 +6,8 @@ import { get } from 'lodash';
import { InputsIndex as Inputs } from 'strapi-helper-plugin';
import CustomLabel from './CustomLabel';
/* eslint-disable */
const Input = ({
autoFocus,
customBootstrapClass,

9
packages/strapi-admin/admin/src/containers/AuthPage/index.js
View File

@ -1,8 +1,7 @@
import React, { memo, useEffect, useReducer, useRef } from 'react';
import PropTypes from 'prop-types';
import { get, isEmpty, omit, set } from 'lodash';
import { get, isEmpty, omit, set, upperFirst } from 'lodash';
import { FormattedMessage } from 'react-intl';
import { upperFirst } from 'lodash';
import { Link, Redirect } from 'react-router-dom';
import {
auth,
@ -267,12 +266,12 @@ AuthPage.propTypes = {
hasAdminUser: PropTypes.bool.isRequired,
location: PropTypes.shape({
search: PropTypes.string.isRequired,
}),
}).isRequired,
match: PropTypes.shape({
params: PropTypes.shape({
authType: PropTypes.string,
}),
}),
}).isRequired,
}).isRequired,
};
export default memo(AuthPage);

2
packages/strapi-admin/admin/src/containers/HomePage/SocialLink.js
View File

@ -38,7 +38,7 @@ const SocialLink = ({ link, name }) => {
return (
<SocialLinkWrapper className="col-6">
<a href={link} target="_blank" rel="noopener noreferrer">
<img src={getSrc(name)} />
<img src={getSrc(name)} alt={name} />
<span>{name}</span>
</a>
</SocialLinkWrapper>

1
packages/strapi-admin/admin/src/containers/HomePage/components.js
View File

@ -1,3 +1,4 @@
/* eslint-disable */
import styled, { css } from 'styled-components';
const Block = styled.div`

6
packages/strapi-admin/admin/src/containers/LanguageProvider/actions.js
View File

@ -4,9 +4,9 @@
*
*/
import {
CHANGE_LOCALE,
} from './constants';
/* eslint-disable */
import { CHANGE_LOCALE } from './constants';
export function changeLocale(languageLocale) {
return {

1
packages/strapi-admin/admin/src/containers/LanguageProvider/constants.js
View File

@ -4,4 +4,5 @@
*
*/
/* eslint-disable */
export const CHANGE_LOCALE = 'app/LanguageToggle/CHANGE_LOCALE';

9
packages/strapi-admin/admin/src/containers/LanguageProvider/index.js
View File

@ -14,13 +14,14 @@ import { IntlProvider } from 'react-intl';
import { defaultsDeep } from 'lodash';
import { selectLocale } from './selectors';
// eslint-disable-next-line react/prefer-stateless-function
export class LanguageProvider extends React.Component {
// eslint-disable-line react/prefer-stateless-function
render() {
const messages = defaultsDeep(
this.props.messages[this.props.locale],
this.props.messages.en,
this.props.messages.en
);
return (
<IntlProvider
locale={this.props.locale}
@ -41,7 +42,7 @@ LanguageProvider.propTypes = {
const mapStateToProps = createSelector(
selectLocale(),
locale => ({ locale }),
locale => ({ locale })
);
function mapDispatchToProps(dispatch) {
@ -52,5 +53,5 @@ function mapDispatchToProps(dispatch) {
export default connect(
mapStateToProps,
mapDispatchToProps,
mapDispatchToProps
)(LanguageProvider);

4
packages/strapi-admin/admin/src/containers/LanguageProvider/reducer.js
View File

@ -9,11 +9,10 @@ import { get, includes, split } from 'lodash';
// Import supported languages from the translations folder
import trads from '../../translations';
import { CHANGE_LOCALE } from './constants';
const languages = Object.keys(trads);
import { CHANGE_LOCALE } from './constants';
// Define a key to store and get user preferences in local storage.
const localStorageKey = 'strapi-admin-language';
@ -24,6 +23,7 @@ const userLanguage =
window.navigator.userLanguage;
let foundLanguage = includes(languages, userLanguage) && userLanguage;
if (!foundLanguage) {
// Split user language in a correct format.
const userLanguageShort = get(split(userLanguage, '-'), '0');

2
packages/strapi-admin/admin/src/containers/ListPluginsPage/index.js
View File

@ -86,7 +86,7 @@ export class ListPluginsPage extends React.Component {
ListPluginsPage.propTypes = {
global: PropTypes.shape({
currentEnvironment: PropTypes.string.isRequired,
}),
}).isRequired,
getPlugins: PropTypes.func.isRequired,
history: PropTypes.object.isRequired,
intl: PropTypes.shape({

2
packages/strapi-admin/admin/src/containers/ListPluginsPage/saga.js
View File

@ -7,6 +7,8 @@ import { deletePluginSucceeded, getPluginsSucceeded } from './actions';
import { GET_PLUGINS, ON_DELETE_PLUGIN_CONFIRM } from './constants';
import { makeSelectPluginToDelete } from './selectors';
/* eslint-disable */
export function* deletePlugin() {
try {
const plugin = yield select(makeSelectPluginToDelete());

5
packages/strapi-admin/admin/src/containers/LocaleToggle/actions.js
View File

@ -3,10 +3,7 @@
* LocaleToggle actions
*/
import {
RESET_DEFAULT_CLASSNAME,
SET_CUSTOM_CLASSNAME,
} from './constants';
import { RESET_DEFAULT_CLASSNAME, SET_CUSTOM_CLASSNAME } from './constants';
export function resetLocaleDefaultClassName() {
return {

2
packages/strapi-admin/admin/src/containers/LocaleToggle/tests/selectors.test.js
View File

@ -29,5 +29,3 @@ describe('<LocaleToggle /> selectors', () => {
});
});
});

2
packages/strapi-admin/admin/src/containers/Marketplace/index.js
View File

@ -118,7 +118,7 @@ Marketplace.propTypes = {
global: PropTypes.shape({
autoReload: PropTypes.bool.isRequired,
currentEnvironment: PropTypes.string.isRequired,
}),
}).isRequired,
history: PropTypes.object.isRequired,
installedPlugins: PropTypes.array.isRequired,
intl: PropTypes.shape({

1
packages/strapi-admin/admin/src/containers/NotificationProvider/actions.js
View File

@ -4,6 +4,7 @@
*
*/
/* eslint-disable import/no-cycle */
import { dispatch } from '../../app';
import { SHOW_NOTIFICATION, HIDE_NOTIFICATION } from './constants';

11
packages/strapi-admin/admin/src/containers/NotificationProvider/index.js
View File

@ -4,16 +4,16 @@
*
*/
/* eslint-disable */
import React from 'react';
import PropTypes from 'prop-types';
import { connect } from 'react-redux';
import { createStructuredSelector } from 'reselect';
import NotificationsContainer from '../../components/NotificationsContainer';
import { selectNotifications } from './selectors';
import { hideNotification } from './actions';
export class NotificationProvider extends React.Component { // eslint-disable-line react/prefer-stateless-function
export class NotificationProvider extends React.Component {
render() {
return (
<NotificationsContainer
@ -35,11 +35,14 @@ const mapStateToProps = createStructuredSelector({
function mapDispatchToProps(dispatch) {
return {
onHideNotification: (id) => {
onHideNotification: id => {
dispatch(hideNotification(id));
},
dispatch,
};
}
export default connect(mapStateToProps, mapDispatchToProps)(NotificationProvider);
export default connect(
mapStateToProps,
mapDispatchToProps
)(NotificationProvider);

62
packages/strapi-admin/admin/src/containers/Onboarding/Wrapper.js
View File

@ -1,5 +1,36 @@
import styled, { keyframes } from 'styled-components';
const fadeIn = keyframes`
0% {
width: auto;
height: auto;
opacity: 0;
}
5% {
opacity: 0;
}
100% {
opacity: 1;
}
`;
const fadeOut = keyframes`
0% {
opacity: 1;
}
60% {
opacity: 0;
}
100% {
opacity: 0;
width: 0;
height: 0;
}
`;
const Wrapper = styled.div`
position: fixed;
right: 15px;
@ -93,35 +124,4 @@ const Wrapper = styled.div`
}
`;
const fadeIn = keyframes`
0% {
width: auto;
height: auto;
opacity: 0;
}
5% {
opacity: 0;
}
100% {
opacity: 1;
}
`;
const fadeOut = keyframes`
0% {
opacity: 1;
}
60% {
opacity: 0;
}
100% {
opacity: 0;
width: 0;
height: 0;
}
`;
export default Wrapper;

7
packages/strapi-admin/admin/src/containers/Onboarding/index.js
View File

@ -27,9 +27,9 @@ import makeSelectOnboarding from './selectors';
import reducer from './reducer';
import saga from './saga';
export class Onboarding extends React.Component {
static contextType = GlobalContext;
/* eslint-disable react/no-array-index-key */
export class Onboarding extends React.Component {
state = { showVideos: false };
componentDidMount() {
@ -92,6 +92,8 @@ export class Onboarding extends React.Component {
this.props.setVideoEnd(index, true);
};
static contextType = GlobalContext;
render() {
const { videos, onClick, setVideoDuration } = this.props;
const { showVideos } = this.state;
@ -144,6 +146,7 @@ export class Onboarding extends React.Component {
<button
onClick={this.handleVideosToggle}
className={this.state.showVideos ? 'active' : ''}
type="button"
>
<i className="fa fa-question" />
<i className="fa fa-times" />

21
packages/strapi-admin/admin/src/containers/Onboarding/reducer.js
View File

@ -5,7 +5,15 @@
*/
import { fromJS } from 'immutable';
import { GET_VIDEOS_SUCCEEDED, SHOULD_OPEN_MODAL, ON_CLICK, SET_VIDEOS_DURATION, UPDATE_VIDEO_START_TIME, SET_VIDEO_END, REMOVE_VIDEOS } from './constants';
import {
GET_VIDEOS_SUCCEEDED,
SHOULD_OPEN_MODAL,
ON_CLICK,
SET_VIDEOS_DURATION,
UPDATE_VIDEO_START_TIME,
SET_VIDEO_END,
REMOVE_VIDEOS,
} from './constants';
const initialState = fromJS({
videos: fromJS([]),
@ -20,7 +28,6 @@ function onboardingReducer(state = initialState, action) {
case ON_CLICK:
return state.updateIn(['videos'], list => {
return list.reduce((acc, current, index) => {
if (index === action.index) {
return acc.updateIn([index, 'isOpen'], v => !v);
}
@ -29,15 +36,17 @@ function onboardingReducer(state = initialState, action) {
}, list);
});
case SET_VIDEOS_DURATION:
return state.updateIn(['videos', action.index, 'duration'], () => action.duration);
return state.updateIn(
['videos', action.index, 'duration'],
() => action.duration
);
case UPDATE_VIDEO_START_TIME: {
const storedVideos = JSON.parse(localStorage.getItem('videos'));
const videos = state.updateIn(['videos'], list => {
return list.reduce((acc, current, index) => {
if (index === action.index) {
storedVideos[index].startTime = action.startTime;
return acc.updateIn([index, 'startTime'], () => action.startTime);
}
@ -52,8 +61,8 @@ function onboardingReducer(state = initialState, action) {
return videos;
}
case SET_VIDEO_END: {
const storedVideos = JSON.parse(localStorage.getItem('videos'));
storedVideos[action.index].end = action.end;
localStorage.setItem('videos', JSON.stringify(storedVideos));

3
packages/strapi-admin/admin/src/containers/PrivateRoute/index.js
View File

@ -10,9 +10,10 @@
import React, { memo } from 'react';
import { Redirect, Route } from 'react-router-dom';
import PropTypes from 'prop-types';
import { auth } from 'strapi-helper-plugin';
/* eslint-disable react/jsx-curly-newline */
const PrivateRoute = ({ component: Component, path, ...rest }) => (
<Route
path={path}

2
packages/strapi-admin/admin/src/containers/SettingsPage/index.js
View File

@ -18,7 +18,7 @@ function SettingsPage() {
title: { id: 'Settings.global' },
links: [
{
title: formatMessage({ id: `Settings.webhooks.title` }),
title: formatMessage({ id: 'Settings.webhooks.title' }),
to: '/settings/webhooks',
name: 'webhooks',
},

18
packages/strapi-admin/admin/src/containers/Webhooks/EditView/index.js
View File

@ -91,12 +91,13 @@ function EditView() {
.filter(key => key.includes('headers'))
.reduce((obj, key) => {
obj[key] = formErrors[key];
return obj;
}, {});
const headerTitle = isCreating
? formatMessage({
id: `Settings.webhooks.create`,
id: 'Settings.webhooks.create',
})
: name;
@ -105,7 +106,7 @@ function EditView() {
color: 'primary',
disabled: isTriggerActionDisabled,
label: formatMessage({
id: `Settings.webhooks.trigger`,
id: 'Settings.webhooks.trigger',
}),
onClick: () => handleTrigger(),
style: {
@ -113,7 +114,7 @@ function EditView() {
},
title: isTriggerActionDisabled
? formatMessage({
id: `Settings.webhooks.trigger.save`,
id: 'Settings.webhooks.trigger.save',
})
: null,
type: 'button',
@ -129,7 +130,7 @@ function EditView() {
color: 'cancel',
disabled: areActionDisabled,
label: formatMessage({
id: `app.components.Button.reset`,
id: 'app.components.Button.reset',
}),
onClick: () => handleReset(),
style: {
@ -141,7 +142,7 @@ function EditView() {
color: 'success',
disabled: areActionDisabled,
label: formatMessage({
id: `app.components.Button.save`,
id: 'app.components.Button.save',
}),
style: {
minWidth: 140,
@ -181,7 +182,7 @@ function EditView() {
const createWebhooks = async () => {
try {
await request(`/admin/webhooks`, {
await request('/admin/webhooks', {
method: 'POST',
body: cleanData(modifiedData),
});
@ -191,7 +192,7 @@ function EditView() {
type: 'SUBMIT_SUCCEEDED',
});
strapi.notification.success(`Settings.webhooks.created`);
strapi.notification.success('Settings.webhooks.created');
goBack();
}
} catch (err) {
@ -312,6 +313,7 @@ function EditView() {
.filter(key => !key.includes('headers'))
.reduce((obj, key) => {
obj[key] = formErrors[key];
return obj;
}, {});
@ -321,7 +323,7 @@ function EditView() {
const setErrors = errors => {
dispatch({
type: 'SET_ERRORS',
errors: errors,
errors,
});
};

3
packages/strapi-admin/admin/src/containers/Webhooks/EditView/reducer.js
View File

@ -30,7 +30,7 @@ const reducer = (state, action) => {
if (Object.keys(headers).length > 0) {
formattedHeaders = Object.keys(headers).map(key => {
return { key: key, value: headers[key] };
return { key, value: headers[key] };
});
}
@ -52,6 +52,7 @@ const reducer = (state, action) => {
if (headers.size === 1) {
return fromJS([header]);
}
return headers.remove(action.index);
});
}

4
packages/strapi-admin/admin/src/containers/Webhooks/EditView/utils/formatData.js
View File

@ -4,12 +4,14 @@ const cleanData = data => {
const webhooks = data;
set(webhooks, 'headers', unformatHeaders(data.headers));
return webhooks;
};
const unformatHeaders = headers => {
return headers.reduce((acc, current) => {
const { key, value } = current;
if (key !== '') {
return {
...acc,
@ -21,4 +23,4 @@ const unformatHeaders = headers => {
}, {});
};
export { cleanData };
export { cleanData, unformatHeaders };

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

@ -46,7 +46,7 @@ function ListView() {
// New button
const addBtnLabel = formatMessage({
id: `Settings.webhooks.list.button.add`,
id: 'Settings.webhooks.list.button.add',
});
const newButtonProps = {
@ -71,25 +71,25 @@ function ListView() {
const headerProps = {
title: {
label: formatMessage({ id: `Settings.webhooks.title` }),
label: formatMessage({ id: 'Settings.webhooks.title' }),
},
content: formatMessage({ id: `Settings.webhooks.list.description` }),
actions: actions,
content: formatMessage({ id: 'Settings.webhooks.list.description' }),
actions,
};
// List props
const rowsCount = webhooks.length;
const titleLabel = `${
rowsCount > 1
? formatMessage({ id: `Settings.webhooks.title` })
: formatMessage({ id: `Settings.webhooks.singular` })
? formatMessage({ id: 'Settings.webhooks.title' })
: formatMessage({ id: 'Settings.webhooks.singular' })
}`;
const title = `${rowsCount} ${titleLabel}`;
const buttonProps = {
color: 'delete',
disabled: webhooksToDelete.length > 0 ? false : true,
label: formatMessage({ id: `Settings.webhooks.list.button.delete` }),
disabled: !(webhooksToDelete.length > 0),
label: formatMessage({ id: 'Settings.webhooks.list.button.delete' }),
onClick: () => setShowModal(true),
type: 'button',
};
@ -102,7 +102,7 @@ function ListView() {
const fetchData = async () => {
try {
const { data } = await request(`/admin/webhooks`, {
const { data } = await request('/admin/webhooks', {
method: 'GET',
});
@ -161,7 +161,7 @@ function ListView() {
};
try {
await request(`/admin/webhooks/batch-delete`, {
await request('/admin/webhooks/batch-delete', {
method: 'POST',
body,
});
@ -186,7 +186,7 @@ function ListView() {
dispatch({
type: 'SET_WEBHOOK_TO_DELETE',
id: id,
id,
});
};
@ -207,7 +207,7 @@ function ListView() {
dispatch({
type: 'SET_WEBHOOK_ENABLED',
keys,
value: value,
value,
});
await request(`/admin/webhooks/${id}`, {

1
packages/strapi-admin/admin/src/containers/Webhooks/ListView/reducer.js
View File

@ -19,6 +19,7 @@ const reducer = (state, action) => {
if (action.value) {
return list.push(action.id);
}
return list.filter(data => data !== action.id);
});
case 'WEBHOOKS_DELETED':

4
packages/strapi-admin/admin/src/containers/Webhooks/index.js
View File

@ -13,8 +13,8 @@ import EditView from './EditView';
function Webhooks() {
return (
<Switch>
<Route exact path={`/settings/webhooks`} component={ListView} />
<Route exact path={`/settings/webhooks/:id`} component={EditView} />
<Route exact path="/settings/webhooks" component={ListView} />
<Route exact path="/settings/webhooks/:id" component={EditView} />
</Switch>
);
}

2
packages/strapi-admin/admin/src/plugins.js
View File

@ -1,3 +1,5 @@
/* eslint-disable */
const injectReducer = require('./utils/injectReducer').default;
const useInjectReducer = require('./utils/injectReducer').useInjectReducer;
const injectSaga = require('./utils/injectSaga').default;

2
packages/strapi-admin/admin/src/utils/injectReducer.js
View File

@ -1,4 +1,4 @@
/* eslint-disable react-hooks/exhaustive-deps */
/* eslint-disable */
import React from 'react';
import hoistNonReactStatics from 'hoist-non-react-statics';
import { ReactReduxContext } from 'react-redux';

2
packages/strapi-admin/admin/src/utils/injectSaga.js
View File

@ -1,4 +1,4 @@
/* eslint-disable react-hooks/exhaustive-deps */
/* eslint-disable */
import React from 'react';
import hoistNonReactStatics from 'hoist-non-react-statics';
import { ReactReduxContext } from 'react-redux';

4
packages/strapi-admin/admin/src/utils/reducerInjectors.js
View File

@ -1,3 +1,5 @@
/* eslint-disable */
import invariant from 'invariant';
import isEmpty from 'lodash/isEmpty';
import isFunction from 'lodash/isFunction';
@ -12,7 +14,7 @@ export function injectReducerFactory(store, isValid) {
invariant(
isString(key) && !isEmpty(key) && isFunction(reducer),
'(app/utils...) injectReducer: Expected `reducer` to be a reducer function',
'(app/utils...) injectReducer: Expected `reducer` to be a reducer function'
);
// Check `store.injectedReducers[key] === reducer` for hot reloading when a key is the same but a reducer is different

30
packages/strapi-admin/admin/src/utils/sagaInjectors.js
View File

@ -1,3 +1,5 @@
/* eslint-disable */
import isEmpty from 'lodash/isEmpty';
import isFunction from 'lodash/isFunction';
import isString from 'lodash/isString';
@ -5,23 +7,20 @@ import invariant from 'invariant';
import conformsTo from 'lodash/conformsTo';
import checkStore from './checkStore';
import {
DAEMON,
ONCE_TILL_UNMOUNT,
RESTART_ON_REMOUNT,
} from './constants';
import { DAEMON, ONCE_TILL_UNMOUNT, RESTART_ON_REMOUNT } from './constants';
const allowedModes = [RESTART_ON_REMOUNT, DAEMON, ONCE_TILL_UNMOUNT];
const checkKey = (key) => invariant(
const checkKey = key =>
invariant(
isString(key) && !isEmpty(key),
'(app/utils...) injectSaga: Expected `key` to be a non empty string'
);
const checkDescriptor = (descriptor) => {
const checkDescriptor = descriptor => {
const shape = {
saga: isFunction,
mode: (mode) => isString(mode) && allowedModes.includes(mode),
mode: mode => isString(mode) && allowedModes.includes(mode),
};
invariant(
conformsTo(descriptor, shape),
@ -33,7 +32,10 @@ export function injectSagaFactory(store, isValid) {
return function injectSaga(key, descriptor = {}, args) {
if (!isValid) checkStore(store);
const newDescriptor = { ...descriptor, mode: descriptor.mode || RESTART_ON_REMOUNT };
const newDescriptor = {
...descriptor,
mode: descriptor.mode || RESTART_ON_REMOUNT,
};
const { saga, mode } = newDescriptor;
checkKey(key);
@ -50,8 +52,14 @@ export function injectSagaFactory(store, isValid) {
}
}
if (!hasSaga || (hasSaga && mode !== DAEMON && mode !== ONCE_TILL_UNMOUNT)) {
store.injectedSagas[key] = { ...newDescriptor, task: store.runSaga(saga, args) }; // eslint-disable-line no-param-reassign
if (
!hasSaga ||
(hasSaga && mode !== DAEMON && mode !== ONCE_TILL_UNMOUNT)
) {
store.injectedSagas[key] = {
...newDescriptor,
task: store.runSaga(saga, args),
}; // eslint-disable-line no-param-reassign
}
};
}

1
packages/strapi-plugin-content-manager/admin/src/components/AddDropdown/components.js
View File

@ -1,4 +1,5 @@
import styled, { css } from 'styled-components';
/* eslint-disable */
const Wrapper = styled.div`
margin-left: 29px;

1
packages/strapi-plugin-content-manager/admin/src/components/CustomInputCheckbox/components.js
View File

@ -1,4 +1,5 @@
import styled, { css } from 'styled-components';
/* eslint-disable */
const Label = styled.label`
cursor: pointer;

2
packages/strapi-plugin-content-manager/admin/src/components/CustomTable/DATE_FORMATS.js
View File

@ -2,7 +2,7 @@ const DATE_FORMATS = {
date: 'dddd, MMMM Do YYYY',
datetime: 'dddd, MMMM Do YYYY HH:mm',
time: 'HH:mm A',
timestamp: 'dddd, MMMM Do YYYY',
timestamp: 'dddd, MMMM Do YYYY HH:mm',
};
export default DATE_FORMATS;

7
packages/strapi-plugin-content-manager/admin/src/components/CustomTable/Row.js
View File

@ -10,6 +10,8 @@ import MediaPreviewList from '../MediaPreviewList';
import { ActionContainer, Truncate, Truncated } from './styledComponents';
import DATE_FORMATS from './DATE_FORMATS';
/* eslint-disable jsx-a11y/no-noninteractive-element-interactions */
const dateToUtcTime = date => moment.parseZone(date).utc();
const getDisplayedValue = (type, value, name) => {
@ -56,6 +58,7 @@ const getDisplayedValue = (type, value, name) => {
second,
};
const date = moment().set(timeObj);
return date.format(DATE_FORMATS.time);
}
default:
@ -104,9 +107,7 @@ function Row({ goTo, isBulkable, row, headers }) {
<Truncated>{memoizedDisplayedValue(header.name)}</Truncated>
</Truncate>
) : (
<MediaPreviewList
files={memoizedDisplayedValue(header.name)}
></MediaPreviewList>
<MediaPreviewList files={memoizedDisplayedValue(header.name)} />
)}
</td>
);

4
packages/strapi-plugin-content-manager/admin/src/components/CustomTable/TableHeader.js
View File

@ -5,6 +5,8 @@ import useListView from '../../hooks/useListView';
import CustomInputCheckbox from '../CustomInputCheckbox';
import { Arrow, Thead } from './styledComponents';
/* eslint-disable jsx-a11y/control-has-associated-label */
function TableHeader({ headers, isBulkable }) {
const {
data,
@ -67,7 +69,7 @@ function TableHeader({ headers, isBulkable }) {
</th>
);
})}
<th></th>
<th />
</tr>
</Thead>
);

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

@ -94,7 +94,6 @@ CustomTable.defaultProps = {
data: [],
headers: [],
isBulkable: true,
slug: '',
};
CustomTable.propTypes = {
@ -108,7 +107,6 @@ CustomTable.propTypes = {
push: PropTypes.func.isRequired,
}).isRequired,
isBulkable: PropTypes.bool,
slug: PropTypes.string,
};
export default withRouter(memo(CustomTable));

2
packages/strapi-plugin-content-manager/admin/src/components/CustomTable/styledComponents.js
View File

@ -1,3 +1,5 @@
/* eslint-disable */
import styled, { css } from 'styled-components';
const Table = styled.table`

2
packages/strapi-plugin-content-manager/admin/src/components/DisplayedFieldsDropdown/MenuDropdown.js
View File

@ -17,6 +17,8 @@ const MenuDropdown = styled(DropdownMenu)`
border-top-right-radius: 0;
`;
}
return '';
}}
`;

2
packages/strapi-plugin-content-manager/admin/src/components/DraggedField/GrabWrapper.js
View File

@ -1,3 +1,5 @@
/* eslint-disable */
import styled, { css } from 'styled-components';
import getColor from './utils/getColor';

2
packages/strapi-plugin-content-manager/admin/src/components/DraggedField/NameWrapper.js
View File

@ -20,6 +20,8 @@ const NameWrapper = styled.div`
color: #007eff;
`;
}
return '';
}}
`;

2
packages/strapi-plugin-content-manager/admin/src/components/DraggedField/RemoveWrapper.js
View File

@ -30,6 +30,8 @@ const RemoveWrapper = styled.div`
}
`;
}
return '';
}}
`;

2
packages/strapi-plugin-content-manager/admin/src/components/DraggedField/SubWrapper.js
View File

@ -1,3 +1,5 @@
/* eslint-disable */
import styled from 'styled-components';
import getColor from './utils/getColor';
import getHeight from './utils/getHeight';

2
packages/strapi-plugin-content-manager/admin/src/components/DraggedField/Wrapper.js
View File

@ -1,3 +1,5 @@
/* eslint-disable */
import styled, { css } from 'styled-components';
import PropTypes from 'prop-types';
import getColor from './utils/getColor';

1
packages/strapi-plugin-content-manager/admin/src/components/DraggedField/index.js
View File

@ -14,6 +14,7 @@ import SubWrapper from './SubWrapper';
import Wrapper from './Wrapper';
import Close from './Close';
/* eslint-disable */
const DraggedField = forwardRef(
(
{

9
packages/strapi-plugin-content-manager/admin/src/components/DraggedField/utils/getColor.js
View File

@ -1,11 +1,12 @@
const getColor = (isOverRemove, isSelected, isOverEditBlock) => {
if (isOverRemove) {
return '#ffa784';
} else if (isSelected || isOverEditBlock) {
return '#aed4fb';
} else {
return '#e9eaeb';
}
if (isSelected || isOverEditBlock) {
return '#aed4fb';
}
return '#e9eaeb';
};
export default getColor;

4
packages/strapi-plugin-content-manager/admin/src/components/DraggedFieldWithPreview/index.js
View File

@ -8,6 +8,8 @@ import DynamicZoneWrapper from './DynamicZoneWrapper';
import Wrapper from './Wrapper';
import DynamicComponent from './DynamicComponent';
/* eslint-disable react/no-array-index-key */
const DraggedFieldWithPreview = forwardRef(
(
{
@ -136,7 +138,7 @@ const DraggedFieldWithPreview = forwardRef(
withLongerHeight={higherFields.includes(
fieldType
)}
></DraggedField>
/>
</div>
);
})}

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

@ -19,7 +19,7 @@ const DynamicComponentCard = ({
onClick(componentUid);
}}
>
<button className="component-icon">
<button className="component-icon" type="button">
<FontAwesomeIcon icon={icon} />
</button>

2
packages/strapi-plugin-content-manager/admin/src/components/DynamicZone/Button.js
View File

@ -22,6 +22,8 @@ const Button = styled(PlusButton)`
}
`;
}
return '';
}}
&.isOpen {
transform: rotate(-45deg);

6
packages/strapi-plugin-content-manager/admin/src/components/DynamicZone/index.js
View File

@ -17,6 +17,8 @@ import Label from './Label';
import RoundCTA from './RoundCTA';
import Wrapper from './Wrapper';
/* eslint-disable react/no-array-index-key */
const DynamicZone = ({ max, min, name }) => {
const [isOpen, setIsOpen] = useState(false);
const {
@ -117,7 +119,7 @@ const DynamicZone = ({ max, min, name }) => {
<RoundCTA
onClick={() => removeComponentFromDynamicZone(name, index)}
>
<FontAwesomeIcon icon={'trash'} />
<FontAwesomeIcon icon="trash" />
</RoundCTA>
<FieldComponent
componentUid={componentUid}
@ -127,7 +129,7 @@ const DynamicZone = ({ max, min, name }) => {
icon={getDynamicComponentInfos(componentUid).icon}
label=""
name={`${name}.${index}`}
isFromDynamicZone={true}
isFromDynamicZone
/>
</div>
);

2
packages/strapi-plugin-content-manager/admin/src/components/FieldComponent/Wrapper.js
View File

@ -12,6 +12,8 @@ const Wrapper = styled.div`
background-color: #fff;
`;
}
return '';
}}
`;

1
packages/strapi-plugin-content-manager/admin/src/components/FieldComponent/index.js
View File

@ -1,3 +1,4 @@
/* eslint-disable import/no-cycle */
import React from 'react';
import PropTypes from 'prop-types';
import { get, size } from 'lodash';

5
packages/strapi-plugin-content-manager/admin/src/components/FieldsReorder/Item.js
View File

@ -85,8 +85,6 @@ const Item = ({
item.rowIndex = targetRow;
item.itemIndex = hoverIndex;
return;
},
drop(item, monitor) {
if (!dropRef.current) {
@ -122,6 +120,7 @@ const Item = ({
item.itemIndex = hoverIndex + 1;
item.rowIndex = targetRow;
return;
}
@ -136,8 +135,6 @@ const Item = ({
item.itemIndex = hoverIndex;
item.rowIndex = targetRow;
return;
},
collect: monitor => ({
canDrop: monitor.canDrop(),

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

@ -5,4 +5,4 @@ const Wrapper = styled.div`
margin-bottom: 6px;
`;
export { Wrapper };
export default Wrapper;

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

@ -6,7 +6,7 @@ import useLayoutDnd from '../../hooks/useLayoutDnd';
import Add from '../AddDropdown';
import SortWrapper from '../SortWrapper';
import { Wrapper } from './components';
import Wrapper from './components';
import Item from './Item';
const FieldsReorder = ({ className }) => {

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

@ -48,6 +48,8 @@ const Div = styled.div`
? 'margin-top .3s ease-out, margin-bottom .2s ease-out'
: 'margin .3s ease-in';
}
return '';
}};
`;

4
packages/strapi-plugin-content-manager/admin/src/components/FilterPicker/index.js
View File

@ -153,6 +153,7 @@ function FilterPicker({
}}
type={get(schema, ['attributes', filter.name, 'type'], '')}
showAddButton={key === modifiedData.length - 1}
// eslint-disable-next-line react/no-array-index-key
key={key}
/>
))}
@ -180,8 +181,7 @@ FilterPicker.propTypes = {
isOpen: PropTypes.bool,
location: PropTypes.shape({
search: PropTypes.string.isRequired,
}),
}).isRequired,
name: PropTypes.string,
onSubmit: PropTypes.func.isRequired,
toggleFilterPickerState: PropTypes.func.isRequired,

1
packages/strapi-plugin-content-manager/admin/src/components/FilterPicker/reducer.js
View File

@ -21,6 +21,7 @@ function reducer(state, action) {
if (action.value && action.value._isAMomentObject === true) {
return moment(action.value, 'YYYY-MM-DD HH:mm:ss').format();
}
return action.value;
})
.updateIn(['modifiedData', index, 'value'], value => {

2
packages/strapi-plugin-content-manager/admin/src/components/FilterPickerOption/Input.js
View File

@ -48,7 +48,7 @@ function Input({ type, ...rest }) {
const styles =
type === 'boolean' ? { minWidth: '100px', maxWidth: '200px' } : style;
const wrapperStyle =
type == 'boolean' ||
type === 'boolean' ||
['date', 'timestamp', 'time', 'datetime'].includes(type)
? { marginRight: '20px' }
: { marginRight: '10px' };

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

@ -1,5 +1,7 @@
import styled from 'styled-components';
/* eslint-disable */
const Wrapper = styled.div`
min-height: 38px;
border-left: ${props => props.borderLeft && '3px solid #007EFF'};

4
packages/strapi-plugin-content-manager/admin/src/components/FormTitle/index.js
View File

@ -3,14 +3,14 @@ import PropTypes from 'prop-types';
import { FormattedMessage } from 'react-intl';
const FormTitle = ({ description, title }) => (
<React.Fragment>
<>
{!!title && <FormattedMessage id={title} />}
{!!description && (
<FormattedMessage id={description}>
{msg => <p>{msg}</p>}
</FormattedMessage>
)}
</React.Fragment>
</>
);
FormTitle.propTypes = {

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

@ -58,6 +58,8 @@ const Label = styled.label`
}
`;
}
return '';
}}
`;

6
packages/strapi-plugin-content-manager/admin/src/components/InputJSON/index.js
View File

@ -24,6 +24,8 @@ const stringify = JSON.stringify;
const DEFAULT_THEME = '3024-night';
class InputJSON extends React.Component {
timer = null;
constructor(props) {
super(props);
this.editor = React.createRef();
@ -88,7 +90,7 @@ class InputJSON extends React.Component {
let content = this.getContentAtLine(line);
if (content === '{') {
line = line + 1;
line += 1;
content = this.getContentAtLine(line);
}
const chEnd = content.length;
@ -101,8 +103,6 @@ class InputJSON extends React.Component {
this.setState({ markedText });
};
timer = null;
handleBlur = ({ target }) => {
const { name, onBlur } = this.props;

1
packages/strapi-plugin-content-manager/admin/src/components/InputJSONWithErrors/index.js
View File

@ -17,7 +17,6 @@ import Wrapper from './Wrapper';
class InputJSONWithErrors extends React.Component {
handleChange = e => {
this.setState({ errors: [] });
this.props.onChange(e);
};

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

@ -1,3 +1,6 @@
/* eslint-disable react/no-array-index-key */
/* eslint-disable import/no-cycle */
import React from 'react';
import PropTypes from 'prop-types';
import { get } from 'lodash';

1
packages/strapi-plugin-content-manager/admin/src/components/PopupForm/index.js
View File

@ -33,6 +33,7 @@ const PopupForm = ({
return type;
};
return (
<Modal isOpen={isOpen} onClosed={onClosed} onToggle={onToggle}>
<HeaderModal>

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

@ -14,6 +14,8 @@ const Wrapper = styled.div`
padding: 0;
`;
}
return '';
}}
border-radius: 2px;
> div {

4
packages/strapi-plugin-content-manager/admin/src/components/RepeatableComponent/AddFieldButton.js
View File

@ -21,6 +21,8 @@ const Button = styled.button`
border-radius: 2px;
`;
}
return '';
}}
${({ hasMinError }) => {
@ -30,6 +32,8 @@ const Button = styled.button`
border-top-color: rgba(227, 233, 243, 0.75);
`;
}
return '';
}}
color: #007eff;

2
packages/strapi-plugin-content-manager/admin/src/components/RepeatableComponent/Banner.js
View File

@ -8,6 +8,8 @@ import PreviewCarret from '../PreviewCarret';
import BannerWrapper from './BannerWrapper';
import CarretTop from './CarretTop';
/* eslint-disable jsx-a11y/no-static-element-interactions */
const Banner = forwardRef(
(
{

2
packages/strapi-plugin-content-manager/admin/src/components/RepeatableComponent/BannerWrapper.js
View File

@ -1,5 +1,7 @@
import styled from 'styled-components';
/* eslint-disable */
const BannerWrapper = styled.button`
display: flex;
height: 36px;

6
packages/strapi-plugin-content-manager/admin/src/components/RepeatableComponent/DraggedItem.js
View File

@ -1,3 +1,4 @@
/* eslint-disable import/no-cycle */
import React, { useEffect, useRef } from 'react';
import PropTypes from 'prop-types';
import { get } from 'lodash';
@ -12,6 +13,8 @@ import FieldComponent from '../FieldComponent';
import Banner from './Banner';
import FormWrapper from './FormWrapper';
/* eslint-disable react/no-array-index-key */
// Issues:
// https://github.com/react-dnd/react-dnd/issues/1368
// https://github.com/frontend-collective/react-sortable-tree/issues/490
@ -89,6 +92,7 @@ const DraggedItem = ({
const clientOffset = monitor.getClientOffset();
// Get pixels to the top
const hoverClientY = clientOffset.y - hoverBoundingRect.top;
// Only perform the move when the mouse has crossed half of the items height
// When dragging downwards, only move when the cursor is below 50%
// When dragging upwards, only move when the cursor is above 50%
@ -109,8 +113,6 @@ const DraggedItem = ({
// but it's good here for the sake of performance
// to avoid expensive index searches.
item.originalPath = hoverPath;
return;
},
});
const [{ isDragging }, drag, preview] = useDrag({

4
packages/strapi-plugin-content-manager/admin/src/components/RepeatableComponent/EmptyComponent.js
View File

@ -12,8 +12,10 @@ const EmptyComponent = styled.div`
${({ hasMinError }) => {
if (hasMinError) {
return `border-color: #FAA684`;
return 'border-color: #FAA684';
}
return '';
}}
> p {

11
packages/strapi-plugin-content-manager/admin/src/components/RepeatableComponent/FormWrapper.js
View File

@ -1,5 +1,7 @@
import styled from 'styled-components';
/* eslint-disable indent */
const FormWrapper = styled.div`
padding-top: 24px;
padding-left: 20px;
@ -9,11 +11,12 @@ const FormWrapper = styled.div`
${({ hasErrors, isOpen }) => {
if (hasErrors) {
return '#ffa784';
} else if (isOpen) {
return '#AED4FB';
} else {
return 'rgba(227, 233, 243, 0.75)';
}
if (isOpen) {
return '#AED4FB';
}
return 'rgba(227, 233, 243, 0.75)';
}};
`;

1
packages/strapi-plugin-content-manager/admin/src/components/RepeatableComponent/index.js
View File

@ -1,3 +1,4 @@
/* eslint-disable import/no-cycle */
import React, { useReducer } from 'react';
import { useDrop } from 'react-dnd';
import PropTypes from 'prop-types';

5
packages/strapi-plugin-content-manager/admin/src/components/Search/index.js
View File

@ -12,11 +12,14 @@ import Cross from '../../icons/Cross';
import Filter from '../../icons/Filter';
import SearchIcon from '../../icons/Search';
import { Wrapper, Infos, Clear } from './components';
const WAIT = 400;
class Search extends React.Component {
state = { value: this.props.initValue };
timer = null;
componentDidUpdate(prevProps) {
const { model, value } = this.props;
@ -28,8 +31,6 @@ class Search extends React.Component {
}
}
timer = null;
resetState = () => this.setState({ value: '' });
handleChange = ({ target }) => {

2
packages/strapi-plugin-content-manager/admin/src/components/SelectMany/Relation.js
View File

@ -7,6 +7,8 @@ import { FormattedMessage } from 'react-intl';
import pluginId from '../../pluginId';
import IconRemove from '../../assets/images/icon_remove.svg';
/* eslint-disable jsx-a11y/no-noninteractive-element-interactions */
const Relation = ({ data, mainField, onRemove, to }) => {
return (
<>

1
packages/strapi-plugin-content-manager/admin/src/components/SelectMany/index.js
View File

@ -64,6 +64,7 @@ function SelectMany({
if (!isEmpty(value)) {
const isSelected =
value.findIndex(item => item.id === candidate.value.id) !== -1;
if (isSelected) {
return false;
}

6
packages/strapi-plugin-content-manager/admin/src/components/SelectWrapper/index.js
View File

@ -59,7 +59,7 @@ function SelectWrapper({
const data = await request(requestUrl, {
method: 'GET',
params: params,
params,
signal,
});
@ -82,6 +82,7 @@ function SelectWrapper({
if (objIndex === -1) {
return true;
}
return (
prevState.findIndex(el => el.value.id === obj.value.id) === index
);
@ -130,6 +131,7 @@ function SelectWrapper({
if (prevState._q === inputValue) {
return prevState;
}
return { ...prevState, _q: inputValue };
});
}
@ -220,7 +222,6 @@ SelectWrapper.defaultProps = {
editable: true,
description: '',
label: '',
plugin: '',
placeholder: '',
};
@ -231,7 +232,6 @@ SelectWrapper.propTypes = {
mainField: PropTypes.string.isRequired,
name: PropTypes.string.isRequired,
placeholder: PropTypes.string,
plugin: PropTypes.string,
relationType: PropTypes.string.isRequired,
targetModel: PropTypes.string.isRequired,
};

Some files were not shown because too many files have changed in this diff Show More