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

Merge branch 'main' into features/api-token-v2

Browse Source
This commit is contained in:
Simone Taeggi 2022-08-26 10:06:17 +02:00
commit 2f3ca60c63
5 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
packages/core/admin/admin/src/content-manager/components/DynamicTable/CellContent/RelationSingle/index.js
View File

@ -13,7 +13,7 @@ const RelationSingle = ({ metadatas, value }) => {
<TypographyMaxWidth textColor="neutral800" ellipsis> <TypographyMaxWidth textColor="neutral800" ellipsis>
<CellValue <CellValue
type={metadatas.mainField.schema.type} type={metadatas.mainField.schema.type}
value={value[metadatas.mainField.name] || value.id} value={value[metadatas.mainField.name] ?? value.id}
/> />
</TypographyMaxWidth> </TypographyMaxWidth>
); );

4
packages/core/admin/admin/src/content-manager/components/SelectOne/SingleValue.js
View File

@ -43,13 +43,13 @@ const SingleValue = (props) => {
<Component {...props}> <Component {...props}>
<Flex> <Flex>
<StyledBullet title={title} isDraft={isDraft} /> <StyledBullet title={title} isDraft={isDraft} />
<Typography ellipsis>{props.data.label || '-'}</Typography> <Typography ellipsis>{props.data.label ?? '-'}</Typography>
</Flex> </Flex>
</Component> </Component>
); );
} }
return <Component {...props}>{props.data.label || '-'}</Component>; return <Component {...props}>{props.data.label ?? '-'}</Component>;
}; };
SingleValue.propTypes = { SingleValue.propTypes = {

4
packages/core/admin/admin/src/content-manager/components/SelectWrapper/Option.js
View File

@ -41,13 +41,13 @@ const Option = (props) => {
<Component {...props}> <Component {...props}>
<Flex> <Flex>
<StyledBullet title={title} isDraft={isDraft} /> <StyledBullet title={title} isDraft={isDraft} />
<Typography ellipsis>{props.label || '-'}</Typography> <Typography ellipsis>{props.label ?? '-'}</Typography>
</Flex> </Flex>
</Component> </Component>
); );
} }
return <Component {...props}>{props.label || '-'}</Component>; return <Component {...props}>{props.label ?? '-'}</Component>;
}; };
Option.defaultProps = { Option.defaultProps = {

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

@ -73,7 +73,7 @@
"@babel/runtime": "7.18.9", "@babel/runtime": "7.18.9",
"@storybook/addon-actions": "6.5.10", "@storybook/addon-actions": "6.5.10",
"@storybook/addon-essentials": "6.5.9", "@storybook/addon-essentials": "6.5.9",
"@storybook/addon-links": "6.5.9", "@storybook/addon-links": "6.5.10",
"@storybook/builder-webpack5": "6.5.9", "@storybook/builder-webpack5": "6.5.9",
"@storybook/manager-webpack5": "6.4.10", "@storybook/manager-webpack5": "6.4.10",
"@storybook/react": "^6.5.10", "@storybook/react": "^6.5.10",

16
yarn.lock
View File

@ -3888,16 +3888,16 @@
regenerator-runtime "^0.13.7" regenerator-runtime "^0.13.7"
ts-dedent "^2.0.0" ts-dedent "^2.0.0"
"@storybook/addon-links@6.5.9": "@storybook/addon-links@6.5.10":
version "6.5.9" version "6.5.10"
resolved "https://registry.yarnpkg.com/@storybook/addon-links/-/addon-links-6.5.9.tgz#91cbca0c044796badf2498723fdd10dacea5748b" resolved "https://registry.yarnpkg.com/@storybook/addon-links/-/addon-links-6.5.10.tgz#f66568fbc84b942032ac2de85f799d69fcf77922"
integrity sha512-4BYC7pkxL3NLRnEgTA9jpIkObQKril+XFj1WtmY/lngF90vvK0Kc/TtvTA2/5tSgrHfxEuPevIdxMIyLJ4ejWQ== integrity sha512-r3WzYIPz7WjHiaPObC2Tg6bHuZRBb/Kt/X+Eitw+jTqBel7ksvkO36tn81q8Eyj61qIdNQmUWAaX/0aewT0kLA==
dependencies: dependencies:
"@storybook/addons" "6.5.9" "@storybook/addons" "6.5.10"
"@storybook/client-logger" "6.5.9" "@storybook/client-logger" "6.5.10"
"@storybook/core-events" "6.5.9" "@storybook/core-events" "6.5.10"
"@storybook/csf" "0.0.2--canary.4566f4d.1" "@storybook/csf" "0.0.2--canary.4566f4d.1"
"@storybook/router" "6.5.9" "@storybook/router" "6.5.10"
"@types/qs" "^6.9.5" "@types/qs" "^6.9.5"
core-js "^3.8.2" core-js "^3.8.2"
global "^4.4.0" global "^4.4.0"