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

fix token type state

Browse Source
This commit is contained in:
Bassel Kanso 2022-08-26 14:52:18 +03:00
parent 061be9d747
commit 2e53c78e8f
2 changed files with 37 additions and 62 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

78
packages/core/admin/admin/src/pages/SettingsPage/pages/ApiTokens/EditView/index.js
View File

@ -139,51 +139,47 @@ const ApiTokenCreateView = () => {
unlockApp();
};
// const hasAllActionsSelected = useMemo(() => {
// const {
// modifiedData: { collectionTypes, singleTypes, custom },
// } = state;
const hasAllActionsSelected = useMemo(() => {
const { data, selectedActions } = state;
// const dataToCheck = { ...collectionTypes, ...singleTypes, ...custom };
const areAllActionsSelected = data.allActionsIds.every((actionId) =>
selectedActions.includes(actionId)
);
// const areAllActionsSelected = getActionsState(dataToCheck, true);
return areAllActionsSelected;
}, [state]);
// return areAllActionsSelected;
// }, [state]);
const hasAllActionsNotSelected = useMemo(() => {
const { selectedActions } = state;
// const hasAllActionsNotSelected = useMemo(() => {
// const {
// modifiedData: { collectionTypes, singleTypes, custom },
// } = state;
const areAllActionsNotSelected = selectedActions.length === 0;
// const dataToCheck = { ...collectionTypes, ...singleTypes, ...custom };
return areAllActionsNotSelected;
}, [state]);
// const areAllActionsNotSelected = getActionsState(dataToCheck, false);
const hasReadOnlyActionsSelected = useMemo(() => {
const { data, selectedActions } = state;
// return areAllActionsNotSelected;
// }, [state]);
const areAllActionsReadOnly = data.allActionsIds.every((actionId) => {
if (actionId.includes('find') || actionId.includes('findOne')) {
return selectedActions.includes(actionId);
}
// const hasReadOnlyActionsSelected = useMemo(() => {
// const {
// modifiedData: { collectionTypes, singleTypes, custom },
// } = state;
return !selectedActions.includes(actionId);
});
// const dataToCheck = { ...collectionTypes, ...singleTypes, ...custom };
// const areAllActionsReadOnly = getActionsState(dataToCheck, false, ['find', 'findOne']);
// return areAllActionsReadOnly;
// }, [state]);
return areAllActionsReadOnly;
}, [state]);
const tokenTypeValue = useMemo(() => {
// if (hasAllActionsSelected && !hasReadOnlyActionsSelected) return 'full-access';
if (hasAllActionsSelected && !hasReadOnlyActionsSelected) return 'full-access';
// if (hasReadOnlyActionsSelected) return 'read-only';
if (hasReadOnlyActionsSelected) return 'read-only';
// if (hasAllActionsNotSelected) return null;
if (hasAllActionsNotSelected) return null;
return 'custom';
}, []);
}, [hasAllActionsSelected, hasReadOnlyActionsSelected, hasAllActionsNotSelected]);
const handleChangeCheckbox = ({ target: { value } }) => {
dispatch({
@ -202,28 +198,14 @@ const ApiTokenCreateView = () => {
};
const handleChangeSelectApiTokenType = ({ target: { value } }) => {
const { modifiedData } = state;
if (value === 'full-access') {
Object.keys(modifiedData).forEach((contentTypes) => {
Object.keys(modifiedData[contentTypes]).forEach((contentType) => {
dispatch({
type: 'ON_CHANGE_SELECT_ALL',
keys: [contentTypes, contentType],
value: true,
});
});
dispatch({
type: 'SELECT_ALL_ACTIONS',
});
}
if (value === 'read-only') {
Object.keys(modifiedData).forEach((contentTypes) => {
Object.keys(modifiedData[contentTypes]).forEach((contentType) => {
dispatch({
type: 'ON_CHANGE_READ_ONLY',
keys: [contentTypes, contentType],
value: false,
});
});
dispatch({
type: 'ON_CHANGE_READ_ONLY',
});
}
};

21
packages/core/admin/admin/src/pages/SettingsPage/pages/ApiTokens/EditView/reducer.js
View File

@ -1,7 +1,6 @@
/* eslint-disable consistent-return */
import produce from 'immer';
import { set, pull } from 'lodash';
import togglePermissions from './utils/togglePermissions';
import { pull } from 'lodash';
export const initialState = {
data: {},
@ -15,26 +14,20 @@ const reducer = (state, action) =>
if (draftState.selectedActions.includes(action.value)) {
pull(draftState.selectedActions, action.value);
} else {
// fill(draftState.selectedActions, action.value);
draftState.selectedActions.push(action.value);
}
break;
}
case 'ON_CHANGE_SELECT_ALL': {
const { pathToValue, updatedValues } = togglePermissions(action, state);
set(draftState, pathToValue, { ...updatedValues });
case 'SELECT_ALL_ACTIONS': {
draftState.selectedActions = [...draftState.data.allActionsIds];
break;
}
case 'ON_CHANGE_READ_ONLY': {
const { pathToValue, updatedValues } = togglePermissions(action, state, [
'find',
'findOne',
]);
set(draftState, pathToValue, { ...updatedValues });
const onlyReadOnlyActions = draftState.data.allActionsIds.filter(
(actionId) => actionId.includes('find') || actionId.includes('findOne')
);
draftState.selectedActions = [...onlyReadOnlyActions];
break;
}
default: