From 71cef36c32632b198b1e5104a0d67ba696e84c1b Mon Sep 17 00:00:00 2001 From: gitstart Date: Tue, 30 Aug 2022 06:08:30 +0000 Subject: [PATCH 1/3] Titles too long do not render properly in content manager --- .../components/DynamicTable/CellContent/index.js | 10 ++++++++++ .../components/SelectOne/SingleValue.js | 5 ++++- 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/packages/core/admin/admin/src/content-manager/components/DynamicTable/CellContent/index.js b/packages/core/admin/admin/src/content-manager/components/DynamicTable/CellContent/index.js index 4798cf2e99..906893ef14 100644 --- a/packages/core/admin/admin/src/content-manager/components/DynamicTable/CellContent/index.js +++ b/packages/core/admin/admin/src/content-manager/components/DynamicTable/CellContent/index.js @@ -2,6 +2,7 @@ import React from 'react'; import PropTypes from 'prop-types'; import styled from 'styled-components'; import { Typography } from '@strapi/design-system/Typography'; +import { Tooltip } from '@strapi/design-system/Tooltip'; import Media from './Media'; import MultipleMedias from './MultipleMedias'; import RelationMultiple from './RelationMultiple'; @@ -55,6 +56,15 @@ const CellContent = ({ content, fieldSchema, metadatas, name, queryInfos, rowId return ; + case 'string': + return ( + }> + + + + + ); + default: return ( diff --git a/packages/core/admin/admin/src/content-manager/components/SelectOne/SingleValue.js b/packages/core/admin/admin/src/content-manager/components/SelectOne/SingleValue.js index 0ed34ecb89..f22e5b766c 100644 --- a/packages/core/admin/admin/src/content-manager/components/SelectOne/SingleValue.js +++ b/packages/core/admin/admin/src/content-manager/components/SelectOne/SingleValue.js @@ -9,6 +9,7 @@ import { Typography } from '@strapi/design-system/Typography'; import get from 'lodash/get'; import has from 'lodash/has'; import isEmpty from 'lodash/isEmpty'; +import { Tooltip } from '@strapi/design-system/Tooltip'; import { getTrad } from '../../utils'; const StyledBullet = styled.div` @@ -43,7 +44,9 @@ const SingleValue = (props) => { - {props.data.label ?? '-'} + + {props.data.label ?? '-'} + ); From a563c6c3dd778fed46fb3582e756524c91c79786 Mon Sep 17 00:00:00 2001 From: gitstart Date: Mon, 10 Oct 2022 05:57:20 +0000 Subject: [PATCH 2/3] address feedbacks --- .../components/DynamicTable/CellContent/index.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/core/admin/admin/src/content-manager/components/DynamicTable/CellContent/index.js b/packages/core/admin/admin/src/content-manager/components/DynamicTable/CellContent/index.js index 906893ef14..b36b401d9e 100644 --- a/packages/core/admin/admin/src/content-manager/components/DynamicTable/CellContent/index.js +++ b/packages/core/admin/admin/src/content-manager/components/DynamicTable/CellContent/index.js @@ -58,7 +58,7 @@ const CellContent = ({ content, fieldSchema, metadatas, name, queryInfos, rowId case 'string': return ( - }> + From ff605481e4f544d54b96f16436894e5c710ce635 Mon Sep 17 00:00:00 2001 From: Gustav Hansen Date: Thu, 13 Oct 2022 11:56:58 +0200 Subject: [PATCH 3/3] Chore: Unify design-system version across packages --- packages/core/admin/package.json | 2 +- packages/core/helper-plugin/package.json | 4 ++-- yarn.lock | 10 ++++------ 3 files changed, 7 insertions(+), 9 deletions(-) diff --git a/packages/core/admin/package.json b/packages/core/admin/package.json index 3edc5ac899..42c3018c03 100644 --- a/packages/core/admin/package.json +++ b/packages/core/admin/package.json @@ -54,7 +54,7 @@ "@strapi/babel-plugin-switch-ee-ce": "4.4.3", "@strapi/design-system": "1.2.5", "@strapi/helper-plugin": "4.4.3", - "@strapi/icons": "1.2.3", + "@strapi/icons": "1.2.5", "@strapi/permissions": "4.4.3", "@strapi/typescript-utils": "4.4.3", "@strapi/utils": "4.4.3", diff --git a/packages/core/helper-plugin/package.json b/packages/core/helper-plugin/package.json index d8fdf96250..66ea9485b9 100644 --- a/packages/core/helper-plugin/package.json +++ b/packages/core/helper-plugin/package.json @@ -78,8 +78,8 @@ "@storybook/builder-webpack5": "6.5.9", "@storybook/manager-webpack5": "6.4.10", "@storybook/react": "^6.5.10", - "@strapi/design-system": "1.2.3", - "@strapi/icons": "1.2.3", + "@strapi/design-system": "1.2.5", + "@strapi/icons": "1.2.5", "@testing-library/react": "11.2.7", "@testing-library/react-hooks": "3.7.0", "babel-loader": "^8.2.5", diff --git a/yarn.lock b/yarn.lock index 5bf9098e87..bee7a5819e 100644 --- a/yarn.lock +++ b/yarn.lock @@ -5453,10 +5453,10 @@ optionalDependencies: typescript "^4.6.2" -"@strapi/icons@1.2.3": - version "1.2.3" - resolved "https://registry.yarnpkg.com/@strapi/icons/-/icons-1.2.3.tgz#5999417e5643ee33e0177577003ddd8e8c53907b" - integrity sha512-vBvOl5sW4GKQAbna3aAhWi2HWOEZ9/v22iX5jG+0vqAwKdRGWaTBkMIYnw0UhKLUbVX3W+P+ViAtIbUycoLelg== +"@strapi/icons@1.2.5": + version "1.2.5" + resolved "https://registry.yarnpkg.com/@strapi/icons/-/icons-1.2.5.tgz#957ab7a336cb2b3ad5a4e1deec3257b41622337f" + integrity sha512-7c3vzMqmm4Xfms47mEJu8F1pV1Eizxrn/sND6WEdizc/S2sRhnye3axaHH4xtncqapB1NKUIUb2z5Bl0Xn+WCw== dependencies: rimraf "^3.0.2" @@ -17874,8 +17874,6 @@ path-case@^2.1.0: version "2.1.1" resolved "https://registry.yarnpkg.com/path-case/-/path-case-2.1.1.tgz#94b8037c372d3fe2906e465bb45e25d226e8eea5" integrity sha1-lLgDfDctP+KQbkZbtF4l0ibo7qU= - dependencies: - no-case "^2.2.0" path-dirname@^1.0.0: version "1.0.2"