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

Use crudReducer in components settings

Browse Source 
Signed-off-by: soupette <cyril.lpz@gmail.com>
This commit is contained in:
soupette 2020-11-10 14:18:15 +01:00
parent e535136fa6
commit 42d711299c
4 changed files with 3 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
packages/strapi-plugin-content-manager/admin/src/containers/ComponentSetttingsView/index.js
View File

@ -5,11 +5,11 @@ import { useSelector } from 'react-redux';
import { getRequestUrl, mergeMetasWithSchema } from '../../utils';
import { makeSelectModelAndComponentSchemas } from '../Main/selectors';
import pluginPermissions from '../../permissions';
import { crudInitialState, crudReducer } from '../../sharedReducers';
import EditSettingsView from '../EditSettingsView';
import reducer, { initialState } from './reducer';
const ComponentSettingsView = () => {
const [{ isLoading, layout }, dispatch] = useReducer(reducer, initialState);
const [{ isLoading, data: layout }, dispatch] = useReducer(crudReducer, crudInitialState);
const schemasSelector = useMemo(makeSelectModelAndComponentSchemas, []);
const { schemas } = useSelector(state => schemasSelector(state), []);
const { uid } = useParams();

35
packages/strapi-plugin-content-manager/admin/src/containers/ComponentSetttingsView/reducer.js
View File

@ -1,35 +0,0 @@
/* eslint-disable consistent-return */
import produce from 'immer';
export const initialState = {
error: null,
isLoading: true,
layout: {},
};
const reducer = (state, action) =>
produce(state, draftState => {
switch (action.type) {
case 'GET_DATA': {
draftState.isLoading = true;
draftState.error = null;
draftState.layout = {};
break;
}
case 'GET_DATA_SUCCEEDED': {
draftState.layout = action.data;
draftState.isLoading = false;
break;
}
case 'GET_DATA_ERROR': {
draftState.isLoading = false;
draftState.error = action.error;
break;
}
default:
return draftState;
}
});
export default reducer;

4
packages/strapi-plugin-content-manager/admin/src/containers/EditSettingsView/reducer.js
View File

@ -31,9 +31,7 @@ const reducer = (state, action) => {
.insert(action.hoverRowIndex, state.getIn([...layoutPathEdit, action.dragRowIndex]));
});
case 'ON_ADD_DATA': {
const size = getInputSize(
state.getIn(['modifiedData', 'schema', 'attributes', action.name, 'type'])
);
const size = getInputSize(state.getIn(['modifiedData', 'attributes', action.name, 'type']));
const listSize = state.getIn(layoutPathEdit).size;
const newList = state.getIn(layoutPathEdit).updateIn([listSize - 1, 'rowContent'], list => {

3
packages/strapi-plugin-content-manager/admin/src/utils/mergeMetasWithSchema.js
View File

@ -4,11 +4,8 @@ const mergeMetasWithSchema = (data, schemas, mainSchemaKey) => {
const findSchema = refUid => schemas.find(obj => obj.uid === refUid);
const merged = Object.assign({}, data);
const mainUID = data[mainSchemaKey].uid;
// const contentTypeUid = data.contentType ? data.contentType.uid : data.component.uid;
const mainSchema = findSchema(mainUID);
// const contentTypeSchema = findSchema(contentTypeUid);
// set(merged, ['contentType'], { ...data.contentType, ...contentTypeSchema });
set(merged, [mainSchemaKey], { ...data[mainSchemaKey], ...mainSchema });
Object.keys(data.components).forEach(compoUID => {