yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-10-28 00:22:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix ctb navigation and upgrade DS version

Browse Source 
Signed-off-by: soupette <cyril@strapi.io>
This commit is contained in:
soupette 2021-11-18 16:21:49 +01:00
parent 1a7f02a19d
commit 443c4d0785
20 changed files with 83 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
packages/core/admin/admin/src/content-manager/components/Wysiwyg/tests/index.test.js
View File

@ -485,7 +485,7 @@ describe('Wysiwyg render and actions buttons', () => {
.c15 { .c15 {
color: #666687; color: #666687;
display: inline-block; display: block;
white-space: nowrap; white-space: nowrap;
overflow: hidden; overflow: hidden;
text-overflow: ellipsis; text-overflow: ellipsis;

6
packages/core/admin/admin/src/content-manager/pages/EditSettingsView/tests/__snapshots__/index.test.js.snap
View File

@ -467,7 +467,7 @@ exports[`EditSettingsView renders and matches the snapshot 1`] = `
.c32 { .c32 {
color: #32324d; color: #32324d;
display: inline-block; display: block;
white-space: nowrap; white-space: nowrap;
overflow: hidden; overflow: hidden;
text-overflow: ellipsis; text-overflow: ellipsis;
@ -2286,7 +2286,7 @@ exports[`EditSettingsView should add field 1`] = `
.c32 { .c32 {
color: #32324d; color: #32324d;
display: inline-block; display: block;
white-space: nowrap; white-space: nowrap;
overflow: hidden; overflow: hidden;
text-overflow: ellipsis; text-overflow: ellipsis;
@ -4598,7 +4598,7 @@ exports[`EditSettingsView should add relation 1`] = `
.c32 { .c32 {
color: #32324d; color: #32324d;
display: inline-block; display: block;
white-space: nowrap; white-space: nowrap;
overflow: hidden; overflow: hidden;
text-overflow: ellipsis; text-overflow: ellipsis;

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

@ -362,7 +362,7 @@ exports[`ADMIN | CM | LV | Configure the view renders and matches the snapshot 1
.c54 { .c54 {
color: #32324d; color: #32324d;
display: inline-block; display: block;
white-space: nowrap; white-space: nowrap;
overflow: hidden; overflow: hidden;
text-overflow: ellipsis; text-overflow: ellipsis;
@ -2166,7 +2166,7 @@ exports[`ADMIN | CM | LV | Configure the view should add field 1`] = `
.c54 { .c54 {
color: #32324d; color: #32324d;
display: inline-block; display: block;
white-space: nowrap; white-space: nowrap;
overflow: hidden; overflow: hidden;
text-overflow: ellipsis; text-overflow: ellipsis;

2
packages/core/admin/admin/src/pages/ProfilePage/tests/index.test.js
View File

@ -257,7 +257,7 @@ describe('ADMIN | Pages | Profile page', () => {
.c40 { .c40 {
color: #32324d; color: #32324d;
display: inline-block; display: block;
white-space: nowrap; white-space: nowrap;
overflow: hidden; overflow: hidden;
text-overflow: ellipsis; text-overflow: ellipsis;

2
packages/core/admin/admin/src/pages/SettingsPage/pages/ApiTokens/ListView/tests/index.test.js
View File

@ -324,7 +324,7 @@ describe('ADMIN | Pages | API TOKENS | ListPage', () => {
.c32 { .c32 {
color: #32324d; color: #32324d;
display: inline-block; display: block;
white-space: nowrap; white-space: nowrap;
overflow: hidden; overflow: hidden;
text-overflow: ellipsis; text-overflow: ellipsis;

2
packages/core/admin/admin/src/pages/SettingsPage/pages/Users/ListPage/PaginationFooter/tests/__snapshots__/index.test.js.snap
View File

@ -252,7 +252,7 @@ exports[`DynamicTable renders and matches the snapshot 1`] = `
.c10 { .c10 {
color: #32324d; color: #32324d;
display: inline-block; display: block;
white-space: nowrap; white-space: nowrap;
overflow: hidden; overflow: hidden;
text-overflow: ellipsis; text-overflow: ellipsis;

2
packages/core/admin/admin/src/pages/SettingsPage/pages/Users/ListPage/tests/index.test.js
View File

@ -702,7 +702,7 @@ describe('ADMIN | Pages | USERS | ListPage', () => {
.c56 { .c56 {
color: #32324d; color: #32324d;
display: inline-block; display: block;
white-space: nowrap; white-space: nowrap;
overflow: hidden; overflow: hidden;
text-overflow: ellipsis; text-overflow: ellipsis;

2
packages/core/admin/ee/admin/pages/SettingsPage/SingleSignOn/tests/index.test.js
View File

@ -220,7 +220,7 @@ describe('Admin | ee | SettingsPage | SSO', () => {
.c45 { .c45 {
color: #32324d; color: #32324d;
display: inline-block; display: block;
white-space: nowrap; white-space: nowrap;
overflow: hidden; overflow: hidden;
text-overflow: ellipsis; text-overflow: ellipsis;

4
packages/core/admin/package.json
View File

@ -33,9 +33,9 @@
"@fortawesome/free-solid-svg-icons": "^5.15.3", "@fortawesome/free-solid-svg-icons": "^5.15.3",
"@fortawesome/react-fontawesome": "^0.1.14", "@fortawesome/react-fontawesome": "^0.1.14",
"@strapi/babel-plugin-switch-ee-ce": "1.0.0", "@strapi/babel-plugin-switch-ee-ce": "1.0.0",
"@strapi/design-system": "0.0.1-alpha.64", "@strapi/design-system": "0.0.1-alpha.67",
"@strapi/helper-plugin": "3.6.8", "@strapi/helper-plugin": "3.6.8",
"@strapi/icons": "0.0.1-alpha.64", "@strapi/icons": "0.0.1-alpha.67",
"@strapi/utils": "3.6.8", "@strapi/utils": "3.6.8",
"axios": "0.24.0", "axios": "0.24.0",
"babel-loader": "8.2.2", "babel-loader": "8.2.2",

7
packages/core/content-type-builder/admin/src/components/FormModal/index.js
View File

@ -1,4 +1,4 @@
import React, { useCallback, useEffect, useMemo } from 'react'; import React, { useCallback, useEffect, useMemo, useRef } from 'react';
import { import {
getYupInnerErrors, getYupInnerErrors,
useTracking, useTracking,
@ -93,6 +93,8 @@ const FormModal = () => {
targetUid, targetUid,
} = useFormModalNavigation(); } = useFormModalNavigation();
const tabGroupRef = useRef();
const formModalSelector = useMemo(makeSelectFormModal, []); const formModalSelector = useMemo(makeSelectFormModal, []);
const dispatch = useDispatch(); const dispatch = useDispatch();
const toggleNotification = useNotification(); const toggleNotification = useNotification();
@ -554,6 +556,8 @@ const FormModal = () => {
type: RESET_PROPS_AND_SET_THE_FORM_FOR_ADDING_A_COMPO_TO_A_DZ, type: RESET_PROPS_AND_SET_THE_FORM_FOR_ADDING_A_COMPO_TO_A_DZ,
}); });
tabGroupRef.current._handlers.setSelectedTabIndex(0);
onNavigateToAddCompoToDZModal({ dynamicZoneTarget: modifiedData.name }); onNavigateToAddCompoToDZModal({ dynamicZoneTarget: modifiedData.name });
} else { } else {
onCloseModal(); onCloseModal();
@ -917,6 +921,7 @@ const FormModal = () => {
label="todo" label="todo"
id="tabs" id="tabs"
variant="simple" variant="simple"
ref={tabGroupRef}
onTabChange={selectedTab => { onTabChange={selectedTab => {
if (selectedTab === 1) { if (selectedTab === 1) {
sendAdvancedTabEvent('advanced'); sendAdvancedTabEvent('advanced');

2
packages/core/content-type-builder/admin/src/pages/ListView/tests/__snapshots__/index.test.js.snap
View File

@ -682,7 +682,7 @@ exports[`<ListView /> renders and matches the snapshot 1`] = `
.c64 { .c64 {
font-weight: 600; font-weight: 600;
color: #32324d; color: #32324d;
display: inline-block; display: block;
white-space: nowrap; white-space: nowrap;
overflow: hidden; overflow: hidden;
text-overflow: ellipsis; text-overflow: ellipsis;

2
packages/core/email/admin/src/pages/Settings/tests/index.test.js
View File

@ -222,7 +222,7 @@ describe('Email | Pages | Settings', () => {
.c29 { .c29 {
color: #666687; color: #666687;
display: inline-block; display: block;
white-space: nowrap; white-space: nowrap;
overflow: hidden; overflow: hidden;
text-overflow: ellipsis; text-overflow: ellipsis;

2
packages/core/helper-plugin/lib/src/components/DateTimePicker/tests/__snapshots__/index.test.js.snap
View File

@ -176,7 +176,7 @@ exports[`DateTimePicker snapshots the component 1`] = `
.c21 { .c21 {
color: #32324d; color: #32324d;
display: inline-block; display: block;
white-space: nowrap; white-space: nowrap;
overflow: hidden; overflow: hidden;
text-overflow: ellipsis; text-overflow: ellipsis;

37
packages/core/helper-plugin/lib/src/components/FilterListURLQuery/tests/__snapshots__/index.test.js.snap
View File

@ -29,6 +29,11 @@ exports[`<FilterListURLQuery /> renders and matches the snapshot 1`] = `
color: #4945ff; color: #4945ff;
padding-right: 12px; padding-right: 12px;
padding-left: 12px; padding-left: 12px;
border-radius: 4px;
border-style: solid;
border-width: 1px;
border-color: #d9d8ff;
height: 2rem;
} }
.c6 { .c6 {
@ -49,12 +54,6 @@ exports[`<FilterListURLQuery /> renders and matches the snapshot 1`] = `
align-items: center; align-items: center;
} }
.c2 {
border: 1px solid #d9d8ff;
border-radius: 4px;
height: 2rem;
}
.c2 svg { .c2 svg {
height: 0.5rem; height: 0.5rem;
width: 0.5rem; width: 0.5rem;
@ -74,7 +73,9 @@ exports[`<FilterListURLQuery /> renders and matches the snapshot 1`] = `
class="c0" class="c0"
> >
<button <button
aria-disabled="false"
class="c1 c2" class="c1 c2"
height="2rem"
> >
<div <div
class="c3" class="c3"
@ -111,7 +112,9 @@ exports[`<FilterListURLQuery /> renders and matches the snapshot 1`] = `
class="c0" class="c0"
> >
<button <button
aria-disabled="false"
class="c1 c2" class="c1 c2"
height="2rem"
> >
<div <div
class="c3" class="c3"
@ -148,7 +151,9 @@ exports[`<FilterListURLQuery /> renders and matches the snapshot 1`] = `
class="c0" class="c0"
> >
<button <button
aria-disabled="false"
class="c1 c2" class="c1 c2"
height="2rem"
> >
<div <div
class="c3" class="c3"
@ -185,7 +190,9 @@ exports[`<FilterListURLQuery /> renders and matches the snapshot 1`] = `
class="c0" class="c0"
> >
<button <button
aria-disabled="false"
class="c1 c2" class="c1 c2"
height="2rem"
> >
<div <div
class="c3" class="c3"
@ -222,7 +229,9 @@ exports[`<FilterListURLQuery /> renders and matches the snapshot 1`] = `
class="c0" class="c0"
> >
<button <button
aria-disabled="false"
class="c1 c2" class="c1 c2"
height="2rem"
> >
<div <div
class="c3" class="c3"
@ -259,7 +268,9 @@ exports[`<FilterListURLQuery /> renders and matches the snapshot 1`] = `
class="c0" class="c0"
> >
<button <button
aria-disabled="false"
class="c1 c2" class="c1 c2"
height="2rem"
> >
<div <div
class="c3" class="c3"
@ -296,7 +307,9 @@ exports[`<FilterListURLQuery /> renders and matches the snapshot 1`] = `
class="c0" class="c0"
> >
<button <button
aria-disabled="false"
class="c1 c2" class="c1 c2"
height="2rem"
> >
<div <div
class="c3" class="c3"
@ -333,7 +346,9 @@ exports[`<FilterListURLQuery /> renders and matches the snapshot 1`] = `
class="c0" class="c0"
> >
<button <button
aria-disabled="false"
class="c1 c2" class="c1 c2"
height="2rem"
> >
<div <div
class="c3" class="c3"
@ -370,7 +385,9 @@ exports[`<FilterListURLQuery /> renders and matches the snapshot 1`] = `
class="c0" class="c0"
> >
<button <button
aria-disabled="false"
class="c1 c2" class="c1 c2"
height="2rem"
> >
<div <div
class="c3" class="c3"
@ -407,7 +424,9 @@ exports[`<FilterListURLQuery /> renders and matches the snapshot 1`] = `
class="c0" class="c0"
> >
<button <button
aria-disabled="false"
class="c1 c2" class="c1 c2"
height="2rem"
> >
<div <div
class="c3" class="c3"
@ -444,7 +463,9 @@ exports[`<FilterListURLQuery /> renders and matches the snapshot 1`] = `
class="c0" class="c0"
> >
<button <button
aria-disabled="false"
class="c1 c2" class="c1 c2"
height="2rem"
> >
<div <div
class="c3" class="c3"
@ -481,7 +502,9 @@ exports[`<FilterListURLQuery /> renders and matches the snapshot 1`] = `
class="c0" class="c0"
> >
<button <button
aria-disabled="false"
class="c1 c2" class="c1 c2"
height="2rem"
> >
<div <div
class="c3" class="c3"
@ -518,7 +541,9 @@ exports[`<FilterListURLQuery /> renders and matches the snapshot 1`] = `
class="c0" class="c0"
> >
<button <button
aria-disabled="false"
class="c1 c2" class="c1 c2"
height="2rem"
> >
<div <div
class="c3" class="c3"

2
packages/core/helper-plugin/lib/src/components/PageSizeURLQuery/tests/index.test.js
View File

@ -78,7 +78,7 @@ describe('<PageSizeURLQuery />', () => {
.c8 { .c8 {
color: #32324d; color: #32324d;
display: inline-block; display: block;
white-space: nowrap; white-space: nowrap;
overflow: hidden; overflow: hidden;
text-overflow: ellipsis; text-overflow: ellipsis;

4
packages/core/helper-plugin/package.json
View File

@ -57,8 +57,8 @@
"@storybook/builder-webpack5": "^6.3.7", "@storybook/builder-webpack5": "^6.3.7",
"@storybook/manager-webpack5": "^6.3.7", "@storybook/manager-webpack5": "^6.3.7",
"@storybook/react": "^6.3.7", "@storybook/react": "^6.3.7",
"@strapi/design-system": "0.0.1-alpha.64", "@strapi/design-system": "0.0.1-alpha.67",
"@strapi/icons": "0.0.1-alpha.64", "@strapi/icons": "0.0.1-alpha.67",
"babel-loader": "^8.2.2", "babel-loader": "^8.2.2",
"cross-env": "^7.0.3", "cross-env": "^7.0.3",
"date-fns": "2.22.1", "date-fns": "2.22.1",

2
packages/core/upload/admin/src/components/EmptyAssets/index.js
View File

@ -5,7 +5,7 @@ import { Typography } from '@strapi/design-system/Typography';
import { Stack } from '@strapi/design-system/Stack'; import { Stack } from '@strapi/design-system/Stack';
import { Box } from '@strapi/design-system/Box'; import { Box } from '@strapi/design-system/Box';
import { Icon } from '@strapi/design-system/Icon'; import { Icon } from '@strapi/design-system/Icon';
import EmptyStateDocument from '@strapi/icons/EmptyStateDocument'; import EmptyStateDocument from '@strapi/icons/EmptyDocuments';
import { EmptyAssetGrid } from './EmptyAssetGrid'; import { EmptyAssetGrid } from './EmptyAssetGrid';
const EnhancedStack = styled(Stack)` const EnhancedStack = styled(Stack)`

23
packages/core/upload/admin/src/components/FilterList/tests/__snapshots__/index.test.js.snap
View File

@ -29,6 +29,11 @@ exports[`<FilterList /> renders and matches the snapshot 1`] = `
color: #4945ff; color: #4945ff;
padding-right: 12px; padding-right: 12px;
padding-left: 12px; padding-left: 12px;
border-radius: 4px;
border-style: solid;
border-width: 1px;
border-color: #d9d8ff;
height: 2rem;
} }
.c6 { .c6 {
@ -49,12 +54,6 @@ exports[`<FilterList /> renders and matches the snapshot 1`] = `
align-items: center; align-items: center;
} }
.c2 {
border: 1px solid #d9d8ff;
border-radius: 4px;
height: 2rem;
}
.c2 svg { .c2 svg {
height: 0.5rem; height: 0.5rem;
width: 0.5rem; width: 0.5rem;
@ -74,7 +73,9 @@ exports[`<FilterList /> renders and matches the snapshot 1`] = `
class="c0" class="c0"
> >
<button <button
aria-disabled="false"
class="c1 c2" class="c1 c2"
height="2rem"
> >
<div <div
class="c3" class="c3"
@ -111,7 +112,9 @@ exports[`<FilterList /> renders and matches the snapshot 1`] = `
class="c0" class="c0"
> >
<button <button
aria-disabled="false"
class="c1 c2" class="c1 c2"
height="2rem"
> >
<div <div
class="c3" class="c3"
@ -148,7 +151,9 @@ exports[`<FilterList /> renders and matches the snapshot 1`] = `
class="c0" class="c0"
> >
<button <button
aria-disabled="false"
class="c1 c2" class="c1 c2"
height="2rem"
> >
<div <div
class="c3" class="c3"
@ -185,7 +190,9 @@ exports[`<FilterList /> renders and matches the snapshot 1`] = `
class="c0" class="c0"
> >
<button <button
aria-disabled="false"
class="c1 c2" class="c1 c2"
height="2rem"
> >
<div <div
class="c3" class="c3"
@ -222,7 +229,9 @@ exports[`<FilterList /> renders and matches the snapshot 1`] = `
class="c0" class="c0"
> >
<button <button
aria-disabled="false"
class="c1 c2" class="c1 c2"
height="2rem"
> >
<div <div
class="c3" class="c3"
@ -259,7 +268,9 @@ exports[`<FilterList /> renders and matches the snapshot 1`] = `
class="c0" class="c0"
> >
<button <button
aria-disabled="false"
class="c1 c2" class="c1 c2"
height="2rem"
> >
<div <div
class="c3" class="c3"

2
packages/plugins/users-permissions/admin/src/pages/AdvancedSettings/tests/index.test.js
View File

@ -238,7 +238,7 @@ describe('ADMIN | Pages | Settings | Advanced Settings', () => {
.c27 { .c27 {
color: #32324d; color: #32324d;
display: inline-block; display: block;
white-space: nowrap; white-space: nowrap;
overflow: hidden; overflow: hidden;
text-overflow: ellipsis; text-overflow: ellipsis;

16
yarn.lock
View File

@ -5234,19 +5234,19 @@
resolve-from "^5.0.0" resolve-from "^5.0.0"
store2 "^2.12.0" store2 "^2.12.0"
"@strapi/design-system@0.0.1-alpha.64": "@strapi/design-system@0.0.1-alpha.67":
version "0.0.1-alpha.64" version "0.0.1-alpha.67"
resolved "https://registry.yarnpkg.com/@strapi/design-system/-/design-system-0.0.1-alpha.64.tgz#07ff58d2b2b713424cc8b9624e9a88e58e91cdd3" resolved "https://registry.yarnpkg.com/@strapi/design-system/-/design-system-0.0.1-alpha.67.tgz#38fc39836a49b239afc6e178d2edd7b06851f806"
integrity sha512-myCOoOUFrJPATcWtG268BBQmR23+7lay2gVN01HZh2wiTAqhOUOVNQo9yvjvsC4lUOH/brSbBEPwmW4kQ5S5iw== integrity sha512-0nkRWKEBHx/O0tQZ70WD1201XUmryhDylZptxT1TBKBaUdO/7vwbViF7HKZi77jHBYF9xN5w5AeUVY8yOqWXBQ==
dependencies: dependencies:
"@internationalized/number" "^3.0.2" "@internationalized/number" "^3.0.2"
compute-scroll-into-view "^1.0.17" compute-scroll-into-view "^1.0.17"
prop-types "^15.7.2" prop-types "^15.7.2"
"@strapi/icons@0.0.1-alpha.64": "@strapi/icons@0.0.1-alpha.67":
version "0.0.1-alpha.64" version "0.0.1-alpha.67"
resolved "https://registry.yarnpkg.com/@strapi/icons/-/icons-0.0.1-alpha.64.tgz#4fc04e62fb37f5f02411281b4932460893498092" resolved "https://registry.yarnpkg.com/@strapi/icons/-/icons-0.0.1-alpha.67.tgz#797bd7bbff4107006c93e20edb4e2736c1bc564b"
integrity sha512-wMkdbx1115nC2pGuIM/xGc4HqkrZPDje/pqnI3Zv9RHtfl5mOVpvmC4rBAKy3EOg2dbmeVy6JPLOvah8GYaEkw== integrity sha512-t2BjpQpXLoX3Tc4f+HxfoQifx1Z9uSVDjwLxld360Aq3zVXknpdUiU+kJsxl8BHj/8H6PB/KS5vB2lcjl4/7Vg==
"@stylelint/postcss-css-in-js@^0.37.2": "@stylelint/postcss-css-in-js@^0.37.2":
version "0.37.2" version "0.37.2"