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

Merge pull request #17665 from strapi/fix/list-settings-view

Browse Source 
Fix: Remove configure the view confirmation
This commit is contained in:
Gustav Hansen 2023-08-14 19:08:34 +02:00 committed by GitHub
commit b9e53ea6f5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 19 additions and 66 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
packages/core/admin/admin/src/content-manager/pages/CollectionTypeRecursivePath/index.js
View File

@ -12,7 +12,7 @@ import { useFetchContentTypeLayout } from '../../hooks';
import { formatLayoutToApi } from '../../utils';
import EditSettingsView from '../EditSettingsView';
import EditViewLayoutManager from '../EditViewLayoutManager';
import ListSettingsView from '../ListSettingsView';
import { ListSettingsView } from '../ListSettingsView';
import ListViewLayout from '../ListViewLayoutManager';
import ErrorFallback from './components/ErrorFallback';

57
packages/core/admin/admin/src/content-manager/pages/ListSettingsView/index.js
View File

@ -1,4 +1,4 @@
import React, { useContext, useReducer, useState } from 'react';
import * as React from 'react';
import {
Button,
@ -9,13 +9,7 @@ import {
Layout,
Main,
} from '@strapi/design-system';
import {
ConfirmDialog,
Link,
useFetchClient,
useNotification,
useTracking,
} from '@strapi/helper-plugin';
import { Link, useFetchClient, useNotification, useTracking } from '@strapi/helper-plugin';
import { ArrowLeft, Check } from '@strapi/icons';
import isEqual from 'lodash/isEqual';
import upperFirst from 'lodash/upperFirst';
@ -34,16 +28,14 @@ import { SortDisplayedFields } from './components/SortDisplayedFields';
import { EXCLUDED_SORT_ATTRIBUTE_TYPES } from './constants';
import reducer, { initialState } from './reducer';
const ListSettingsView = ({ layout, slug }) => {
export const ListSettingsView = ({ layout, slug }) => {
const { put } = useFetchClient();
const { formatMessage } = useIntl();
const { trackUsage } = useTracking();
const pluginsQueryParams = usePluginsQueryParams();
const toggleNotification = useNotification();
const { refetchData } = useContext(ModelsContext);
const [showWarningSubmit, setWarningSubmit] = useState(false);
const toggleWarningSubmit = () => setWarningSubmit((prevState) => !prevState);
const [{ fieldToEdit, fieldForm, initialData, modifiedData }, dispatch] = useReducer(
const { refetchData } = React.useContext(ModelsContext);
const [{ fieldToEdit, fieldForm, initialData, modifiedData }, dispatch] = React.useReducer(
reducer,
initialState,
() => ({
@ -101,16 +93,6 @@ const ListSettingsView = ({ layout, slug }) => {
}
);
const handleConfirm = async () => {
const { layouts, settings, metadatas } = modifiedData;
mutate({
layouts,
settings,
metadatas,
});
};
const handleAddField = (item) => {
dispatch({
type: 'ADD_FIELD',
@ -134,9 +116,17 @@ const ListSettingsView = ({ layout, slug }) => {
}
};
const handleSubmit = (e) => {
e.preventDefault();
toggleWarningSubmit();
const handleSubmit = (event) => {
event.preventDefault();
const { layouts, settings, metadatas } = modifiedData;
mutate({
layouts,
settings,
metadatas,
});
trackUsage('willSaveContentTypeLayout');
};
@ -253,19 +243,6 @@ const ListSettingsView = ({ layout, slug }) => {
/>
</Flex>
</ContentLayout>
<ConfirmDialog
bodyText={{
id: getTrad('popUpWarning.warning.updateAllSettings'),
defaultMessage: 'This will modify all your settings',
}}
iconRightButton={<Check />}
isConfirmButtonLoading={isSubmittingForm}
isOpen={showWarningSubmit}
onToggleDialog={toggleWarningSubmit}
onConfirm={handleConfirm}
variantRightButton="success-light"
/>
</form>
{isModalFormOpen && (
@ -305,5 +282,3 @@ ListSettingsView.propTypes = {
}).isRequired,
slug: PropTypes.string.isRequired,
};
export default ListSettingsView;

26
packages/core/admin/admin/src/content-manager/pages/ListSettingsView/tests/index.test.js
View File

@ -10,7 +10,7 @@ import { QueryClient, QueryClientProvider } from 'react-query';
import { MemoryRouter, Route } from 'react-router-dom';
import ModelsContext from '../../../contexts/ModelsContext';
import ListSettingsView from '../index';
import { ListSettingsView } from '../index';
jest.mock('@strapi/helper-plugin', () => ({
...jest.requireActual('@strapi/helper-plugin'),
@ -179,7 +179,7 @@ describe('ADMIN | CM | LV | Configure the view', () => {
expect(testLocation.search).toEqual('?page=1&pageSize=10&sort=id:ASC&plugins[i18n][locale]=fr');
});
it('should add field and let the user save', async () => {
it('should add field', async () => {
const { getByRole, user } = render();
await waitFor(() =>
@ -191,28 +191,6 @@ describe('ADMIN | CM | LV | Configure the view', () => {
expect(getByRole('button', { name: `Edit Cover` })).toBeInTheDocument();
expect(getByRole('button', { name: `Delete Cover` })).toBeInTheDocument();
fireEvent.click(getByRole('button', { name: 'Save' }));
expect(getByRole('dialog', { name: 'Confirmation' })).toBeInTheDocument();
await user.click(getByRole('button', { name: 'Confirm' }));
});
it('should delete field', async () => {
const { getByRole, user } = render();
await waitFor(() =>
expect(getByRole('heading', { name: 'Configure the view - Michka' })).toBeInTheDocument()
);
await user.click(getByRole('button', { name: 'Delete id' }));
fireEvent.click(getByRole('button', { name: 'Save' }));
expect(getByRole('dialog', { name: 'Confirmation' })).toBeInTheDocument();
await user.click(getByRole('button', { name: 'Confirm' }));
});
describe('Edit modal', () => {