diff --git a/packages/strapi-admin/package.json b/packages/strapi-admin/package.json index 830879f8bd..fab238b1e6 100644 --- a/packages/strapi-admin/package.json +++ b/packages/strapi-admin/package.json @@ -23,12 +23,12 @@ "@babel/preset-env": "^7.9.5", "@babel/preset-react": "^7.9.4", "@babel/runtime": "^7.9.2", - "@buffetjs/core": "3.3.1", - "@buffetjs/custom": "3.3.1", - "@buffetjs/hooks": "3.3.1", - "@buffetjs/icons": "3.3.1", - "@buffetjs/styles": "3.3.1", - "@buffetjs/utils": "3.3.1", + "@buffetjs/core": "3.3.1-next.2", + "@buffetjs/custom": "3.3.1-next.2", + "@buffetjs/hooks": "3.3.1-next.2", + "@buffetjs/icons": "3.3.1-next.2", + "@buffetjs/styles": "3.3.1-next.2", + "@buffetjs/utils": "3.3.1-next.2", "@casl/ability": "^4.1.5", "@fortawesome/fontawesome-free": "^5.11.2", "@fortawesome/fontawesome-svg-core": "^1.2.32", diff --git a/packages/strapi-helper-plugin/package.json b/packages/strapi-helper-plugin/package.json index 83817ef8cd..832f69fd32 100644 --- a/packages/strapi-helper-plugin/package.json +++ b/packages/strapi-helper-plugin/package.json @@ -50,12 +50,12 @@ "rollup-plugin-terser": "^4.0.4" }, "dependencies": { - "@buffetjs/core": "3.3.1", - "@buffetjs/custom": "3.3.1", - "@buffetjs/hooks": "3.3.1", - "@buffetjs/icons": "3.3.1", - "@buffetjs/styles": "3.3.1", - "@buffetjs/utils": "3.3.1", + "@buffetjs/core": "3.3.1-next.2", + "@buffetjs/custom": "3.3.1-next.2", + "@buffetjs/hooks": "3.3.1-next.2", + "@buffetjs/icons": "3.3.1-next.2", + "@buffetjs/styles": "3.3.1-next.2", + "@buffetjs/utils": "3.3.1-next.2", "bootstrap": "^4.5.3", "classnames": "^2.2.5", "immutable": "^3.8.2", diff --git a/packages/strapi-plugin-content-manager/admin/src/components/CustomTable/Row.js b/packages/strapi-plugin-content-manager/admin/src/components/CustomTable/Row.js index bc45bcd048..cba3ee9fb9 100644 --- a/packages/strapi-plugin-content-manager/admin/src/components/CustomTable/Row.js +++ b/packages/strapi-plugin-content-manager/admin/src/components/CustomTable/Row.js @@ -6,11 +6,11 @@ import { useGlobalContext } from 'strapi-helper-plugin'; import { IconLinks } from '@buffetjs/core'; import { Duplicate } from '@buffetjs/icons'; import { FontAwesomeIcon } from '@fortawesome/react-fontawesome'; -import useListView from '../../hooks/useListView'; +import { useListView } from '../../hooks'; import dateFormats from '../../utils/dateFormats'; import CustomInputCheckbox from '../CustomInputCheckbox'; -import MediaPreviewList from '../MediaPreviewList'; -import { ActionContainer, Truncate, Truncated } from './styledComponents'; +import { ActionContainer } from './styledComponents'; +import RowCell from './RowCell'; /* eslint-disable jsx-a11y/no-noninteractive-element-interactions */ @@ -62,6 +62,9 @@ const getDisplayedValue = (type, value, name) => { return date.format(dateFormats.time); } + case 'relation': { + return value; + } default: return '-'; } @@ -84,12 +87,16 @@ function Row({ canCreate, canDelete, canUpdate, isBulkable, row, headers, goTo } icon: canCreate ? : null, onClick: e => { e.stopPropagation(); - goTo(`create/clone/${row.id}`); }, }, { icon: canUpdate ? : null, + onClick: e => { + e.stopPropagation(); + emitEventRef.current('willDeleteEntryFromList'); + goTo(row.id); + }, }, { icon: canDelete ? : null, @@ -113,21 +120,22 @@ function Row({ canCreate, canDelete, canUpdate, isBulkable, row, headers, goTo } /> )} - {headers.map(({ key, name, fieldSchema: { type }, cellFormatter }) => { - const isMedia = type === 'media'; - - return ( + {headers.map( + ({ key, name, fieldSchema: { type, relationType }, cellFormatter, metadatas }) => ( - {isMedia && } - {cellFormatter && cellFormatter(row)} - {!isMedia && !cellFormatter && ( - - {memoizedDisplayedValue(name, type)} - + {cellFormatter ? ( + cellFormatter(row) + ) : ( + )} - ); - })} + ) + )} diff --git a/packages/strapi-plugin-content-manager/admin/src/components/CustomTable/RowCell.js b/packages/strapi-plugin-content-manager/admin/src/components/CustomTable/RowCell.js new file mode 100644 index 0000000000..eb003635b6 --- /dev/null +++ b/packages/strapi-plugin-content-manager/admin/src/components/CustomTable/RowCell.js @@ -0,0 +1,36 @@ +import React, { memo } from 'react'; +import PropTypes from 'prop-types'; +import MediaPreviewList from '../MediaPreviewList'; +import RelationPreviewList from '../RelationPreviewList'; +import { Truncate, Truncated } from './styledComponents'; + +const RowCell = ({ metadatas, type, value, relationType }) => { + if (type === 'media') { + return ; + } + + if (type === 'relation') { + return ; + } + + return ( + + {value} + + ); +}; + +RowCell.defaultProps = { + type: null, + value: null, + relationType: null, +}; + +RowCell.propTypes = { + metadatas: PropTypes.object.isRequired, + relationType: PropTypes.string, + type: PropTypes.string, + value: PropTypes.any, +}; + +export default memo(RowCell); diff --git a/packages/strapi-plugin-content-manager/admin/src/components/CustomTable/index.js b/packages/strapi-plugin-content-manager/admin/src/components/CustomTable/index.js index 14ee09461e..4c6e947ab0 100644 --- a/packages/strapi-plugin-content-manager/admin/src/components/CustomTable/index.js +++ b/packages/strapi-plugin-content-manager/admin/src/components/CustomTable/index.js @@ -55,13 +55,20 @@ const CustomTable = ({ const colSpanLength = isBulkable && canDelete ? headers.length + 2 : headers.length + 1; - const handleGoTo = id => { + const handleRowGoTo = id => { emitEvent('willEditEntryFromList'); push({ pathname: `${pathname}/${id}`, state: { from: pathname }, }); }; + const handleEditGoTo = id => { + emitEvent('willEditEntryFromButton'); + push({ + pathname: `${pathname}/${id}`, + state: { from: pathname }, + }); + }; const values = { contentType: upperFirst(label), search: _q }; let tableEmptyMsgId = filters.length > 0 ? 'withFilters' : 'withoutFilter'; @@ -89,7 +96,7 @@ const CustomTable = ({ e.preventDefault(); e.stopPropagation(); - handleGoTo(row.id); + handleRowGoTo(row.id); }} > ); diff --git a/packages/strapi-plugin-content-manager/admin/src/components/RelationPreviewList/CountWrapper.js b/packages/strapi-plugin-content-manager/admin/src/components/RelationPreviewList/CountWrapper.js new file mode 100644 index 0000000000..377a6c860e --- /dev/null +++ b/packages/strapi-plugin-content-manager/admin/src/components/RelationPreviewList/CountWrapper.js @@ -0,0 +1,7 @@ +import styled from 'styled-components'; + +const CountWrapper = styled.div` + padding-top: 0.3rem; +`; + +export default CountWrapper; diff --git a/packages/strapi-plugin-content-manager/admin/src/components/RelationPreviewList/index.js b/packages/strapi-plugin-content-manager/admin/src/components/RelationPreviewList/index.js new file mode 100644 index 0000000000..e3288661bb --- /dev/null +++ b/packages/strapi-plugin-content-manager/admin/src/components/RelationPreviewList/index.js @@ -0,0 +1,55 @@ +import React from 'react'; +import PropTypes from 'prop-types'; +import { Flex, Padded, Count } from '@buffetjs/core'; +import { useIntl } from 'react-intl'; + +import { getTrad } from '../../utils'; +import { Truncate, Truncated } from '../CustomTable/styledComponents'; +import CountWrapper from './CountWrapper'; + +const RelationPreviewList = ({ metadatas: { mainField }, relationType, value }) => { + const { formatMessage } = useIntl(); + const isSingle = ['oneWay', 'oneToOne', 'manyToOne'].includes(relationType); + + if (isSingle) { + return ( + + {value ? value[mainField] : '-'} + + ); + } + + const size = value ? value.length : 0; + + return ( + + + + + + + + {formatMessage({ + id: getTrad( + size > 1 ? 'containers.ListPage.items.plural' : 'containers.ListPage.items.singular' + ), + })} + + + + ); +}; + +RelationPreviewList.defaultProps = { + value: null, +}; + +RelationPreviewList.propTypes = { + metadatas: PropTypes.shape({ + mainField: PropTypes.string.isRequired, + }).isRequired, + relationType: PropTypes.string.isRequired, + value: PropTypes.oneOfType([PropTypes.array, PropTypes.object]), +}; + +export default RelationPreviewList; diff --git a/packages/strapi-plugin-content-manager/admin/src/containers/ListView/index.js b/packages/strapi-plugin-content-manager/admin/src/containers/ListView/index.js index 12fee4e8cf..2bc6e3acba 100644 --- a/packages/strapi-plugin-content-manager/admin/src/containers/ListView/index.js +++ b/packages/strapi-plugin-content-manager/admin/src/containers/ListView/index.js @@ -193,6 +193,7 @@ function ListView({ }); onDeleteSeveralDataSucceeded(); + emitEventRef.current('didBulkDeleteEntries'); } catch (err) { strapi.notification.error(`${pluginId}.error.record.delete`); } @@ -346,6 +347,11 @@ function ListView({ }; }, [total, headerAction, label, canRead, formatMessage]); + const handleToggleModalDeleteAll = e => { + emitEventRef.current('willBulkDeleteEntries'); + toggleModalDeleteAll(e); + }; + return ( <> if (!value) { const { metadatas, attributes } = state.contentType; + let metas = metadatas[name].list; + + if (attributes[name].type === 'relation') { + const mainField = metadatas[name].edit.mainField; + metas = { ...metas, mainField }; + } + drafState.displayedHeaders.push({ name, fieldSchema: attributes[name], - metadatas: metadatas[name].list, + metadatas: metas, key: `__${name}_key__`, }); } else { diff --git a/packages/strapi-plugin-content-manager/admin/src/hooks/useFetchContentTypeLayout/utils/formatLayouts.js b/packages/strapi-plugin-content-manager/admin/src/hooks/useFetchContentTypeLayout/utils/formatLayouts.js index 68f0c88c58..9d7a6d9d87 100644 --- a/packages/strapi-plugin-content-manager/admin/src/hooks/useFetchContentTypeLayout/utils/formatLayouts.js +++ b/packages/strapi-plugin-content-manager/admin/src/hooks/useFetchContentTypeLayout/utils/formatLayouts.js @@ -82,7 +82,16 @@ const formatLayoutWithMetas = (obj, ctUid, models) => { const formatListLayoutWithMetas = obj => { const formatted = obj.layouts.list.reduce((acc, current) => { const fieldSchema = get(obj, ['attributes', current], {}); - const metadatas = get(obj, ['metadatas', current, 'list'], {}); + let metadatas = get(obj, ['metadatas', current, 'list'], {}); + + const type = fieldSchema.type; + + if (type === 'relation') { + metadatas = { + ...metadatas, + mainField: get(obj, ['metadatas', current, 'edit', 'mainField'], 'id'), + }; + } acc.push({ key: `__${current}_key__`, name: current, fieldSchema, metadatas }); diff --git a/packages/strapi-plugin-content-manager/admin/src/translations/en.json b/packages/strapi-plugin-content-manager/admin/src/translations/en.json index b2d2c0f76b..d4ebfcefd9 100644 --- a/packages/strapi-plugin-content-manager/admin/src/translations/en.json +++ b/packages/strapi-plugin-content-manager/admin/src/translations/en.json @@ -77,6 +77,8 @@ "containers.List.pluginHeaderDescription.singular": "{label} entry found", "containers.List.published": "Published", "containers.ListPage.displayedFields": "Displayed Fields", + "containers.ListPage.items.plural": "items", + "containers.ListPage.items.singular": "item", "containers.ListPage.table-headers.published_at": "State", "containers.ListSettingsView.modal-form.edit-label": "Edit the label", "containers.SettingPage.add.field": "Insert another field", diff --git a/packages/strapi-plugin-content-manager/package.json b/packages/strapi-plugin-content-manager/package.json index 69d006ed83..01f146df5f 100644 --- a/packages/strapi-plugin-content-manager/package.json +++ b/packages/strapi-plugin-content-manager/package.json @@ -9,12 +9,12 @@ "required": true }, "dependencies": { - "@buffetjs/core": "3.3.1", - "@buffetjs/custom": "3.3.1", - "@buffetjs/hooks": "3.3.1", - "@buffetjs/icons": "3.3.1", - "@buffetjs/styles": "3.3.1", - "@buffetjs/utils": "3.3.1", + "@buffetjs/core": "3.3.1-next.2", + "@buffetjs/custom": "3.3.1-next.2", + "@buffetjs/hooks": "3.3.1-next.2", + "@buffetjs/icons": "3.3.1-next.2", + "@buffetjs/styles": "3.3.1-next.2", + "@buffetjs/utils": "3.3.1-next.2", "@sindresorhus/slugify": "1.1.0", "classnames": "^2.2.6", "codemirror": "^5.46.0", diff --git a/packages/strapi-plugin-content-type-builder/package.json b/packages/strapi-plugin-content-type-builder/package.json index b81877b9a8..46a103de86 100644 --- a/packages/strapi-plugin-content-type-builder/package.json +++ b/packages/strapi-plugin-content-type-builder/package.json @@ -8,12 +8,12 @@ "description": "content-type-builder.plugin.description" }, "dependencies": { - "@buffetjs/core": "3.3.1", - "@buffetjs/custom": "3.3.1", - "@buffetjs/hooks": "3.3.1", - "@buffetjs/icons": "3.3.1", - "@buffetjs/styles": "3.3.1", - "@buffetjs/utils": "3.3.1", + "@buffetjs/core": "3.3.1-next.2", + "@buffetjs/custom": "3.3.1-next.2", + "@buffetjs/hooks": "3.3.1-next.2", + "@buffetjs/icons": "3.3.1-next.2", + "@buffetjs/styles": "3.3.1-next.2", + "@buffetjs/utils": "3.3.1-next.2", "@sindresorhus/slugify": "1.1.0", "fs-extra": "^9.0.1", "immutable": "^3.8.2", diff --git a/packages/strapi-plugin-documentation/package.json b/packages/strapi-plugin-documentation/package.json index 6b878fa35f..412f29c8cb 100644 --- a/packages/strapi-plugin-documentation/package.json +++ b/packages/strapi-plugin-documentation/package.json @@ -11,12 +11,12 @@ "test": "echo \"no tests yet\"" }, "dependencies": { - "@buffetjs/core": "3.3.1", - "@buffetjs/custom": "3.3.1", - "@buffetjs/hooks": "3.3.1", - "@buffetjs/icons": "3.3.1", - "@buffetjs/styles": "3.3.1", - "@buffetjs/utils": "3.3.1", + "@buffetjs/core": "3.3.1-next.2", + "@buffetjs/custom": "3.3.1-next.2", + "@buffetjs/hooks": "3.3.1-next.2", + "@buffetjs/icons": "3.3.1-next.2", + "@buffetjs/styles": "3.3.1-next.2", + "@buffetjs/utils": "3.3.1-next.2", "cheerio": "^1.0.0-rc.3", "fs-extra": "^9.0.1", "immutable": "^3.8.2", diff --git a/packages/strapi-plugin-upload/admin/src/components/ModalTab/Count/Wrapper.js b/packages/strapi-plugin-upload/admin/src/components/ModalTab/Count/Wrapper.js index 45676ac838..5a49e7c10d 100644 --- a/packages/strapi-plugin-upload/admin/src/components/ModalTab/Count/Wrapper.js +++ b/packages/strapi-plugin-upload/admin/src/components/ModalTab/Count/Wrapper.js @@ -2,9 +2,6 @@ import styled from 'styled-components'; import Flex from '../../Flex'; -// TODO : Design System -// Wait for the product designer to see -// if we need to add this new color in the theme or use an existing one. const Wrapper = styled(Flex)` width: 1.4rem; height: 1.4rem; diff --git a/packages/strapi-plugin-upload/package.json b/packages/strapi-plugin-upload/package.json index 6597880c3f..1f43aa0328 100644 --- a/packages/strapi-plugin-upload/package.json +++ b/packages/strapi-plugin-upload/package.json @@ -12,12 +12,12 @@ "test": "echo \"no tests yet\"" }, "dependencies": { - "@buffetjs/core": "3.3.1", - "@buffetjs/custom": "3.3.1", - "@buffetjs/hooks": "3.3.1", - "@buffetjs/icons": "3.3.1", - "@buffetjs/styles": "3.3.1", - "@buffetjs/utils": "3.3.1", + "@buffetjs/core": "3.3.1-next.2", + "@buffetjs/custom": "3.3.1-next.2", + "@buffetjs/hooks": "3.3.1-next.2", + "@buffetjs/icons": "3.3.1-next.2", + "@buffetjs/styles": "3.3.1-next.2", + "@buffetjs/utils": "3.3.1-next.2", "byte-size": "^6.2.0", "cropperjs": "^1.5.6", "immer": "^7.0.14", diff --git a/packages/strapi-plugin-users-permissions/package.json b/packages/strapi-plugin-users-permissions/package.json index d1f1557564..e71893b5a3 100644 --- a/packages/strapi-plugin-users-permissions/package.json +++ b/packages/strapi-plugin-users-permissions/package.json @@ -12,12 +12,12 @@ "test": "echo \"no tests yet\"" }, "dependencies": { - "@buffetjs/core": "3.3.1", - "@buffetjs/custom": "3.3.1", - "@buffetjs/hooks": "3.3.1", - "@buffetjs/icons": "3.3.1", - "@buffetjs/styles": "3.3.1", - "@buffetjs/utils": "3.3.1", + "@buffetjs/core": "3.3.1-next.2", + "@buffetjs/custom": "3.3.1-next.2", + "@buffetjs/hooks": "3.3.1-next.2", + "@buffetjs/icons": "3.3.1-next.2", + "@buffetjs/styles": "3.3.1-next.2", + "@buffetjs/utils": "3.3.1-next.2", "@purest/providers": "^1.0.1", "bcryptjs": "^2.4.3", "grant-koa": "5.2.0", diff --git a/yarn.lock b/yarn.lock index 8076eadd2b..a57a48b68d 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1036,15 +1036,15 @@ resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39" integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw== -"@buffetjs/core@3.3.1": - version "3.3.1" - resolved "https://registry.yarnpkg.com/@buffetjs/core/-/core-3.3.1.tgz#56e4a398a854989c5072be7ae6c1e18ceb5861ed" - integrity sha512-WnbZB4yG0JskFmRu9EutzV3pvzaI/Qm23a74f+teuLuODLwK5OpClje76ZL1zw3ezxkGQ6O9dQ/A4J6hYcOimw== +"@buffetjs/core@3.3.1-next.2": + version "3.3.1-next.2" + resolved "https://registry.yarnpkg.com/@buffetjs/core/-/core-3.3.1-next.2.tgz#a10eb10bcc8c729c41f2aec268d4aa42b1ba3442" + integrity sha512-6BCuHqW74X8MW11l3USh7iQHmytRUOsPpiO4vcbqTOzNXvJftu3yaXS+fvXrRES5N48sY4TZ2HpLl2fSW541Hg== dependencies: - "@buffetjs/hooks" "3.3.1" - "@buffetjs/icons" "3.3.1" - "@buffetjs/styles" "3.3.1" - "@buffetjs/utils" "3.3.1" + "@buffetjs/hooks" "3.3.1-next.2" + "@buffetjs/icons" "3.3.1-next.2" + "@buffetjs/styles" "3.3.1-next.2" + "@buffetjs/utils" "3.3.1-next.2" "@fortawesome/fontawesome-svg-core" "^1.2.25" "@fortawesome/free-regular-svg-icons" "^5.11.2" "@fortawesome/free-solid-svg-icons" "^5.11.2" @@ -1060,35 +1060,35 @@ react-with-direction "^1.3.1" reactstrap "^8.5.1" -"@buffetjs/custom@3.3.1": - version "3.3.1" - resolved "https://registry.yarnpkg.com/@buffetjs/custom/-/custom-3.3.1.tgz#6f01fa91302cdb31199fc3489096b3c7d3e988ff" - integrity sha512-akv22y1q3yzKiO0KtSMTXzF9UqBgWkZSaVgnWjtJ3xjB3ZfYlntwRvw1hJ791G0/Be2wypRUH2qIR/9kHsTIQw== +"@buffetjs/custom@3.3.1-next.2": + version "3.3.1-next.2" + resolved "https://registry.yarnpkg.com/@buffetjs/custom/-/custom-3.3.1-next.2.tgz#9c8291ee24222e305c16824d14d78a36e68e38a6" + integrity sha512-qiqzVM6A7Cofy0W+OU5rcmz4hkcP/V2i8QQQiPsaRcOnmhtfriCwi5eGiae45f7RL77faMRwsZYxefrmTTr2Hg== dependencies: - "@buffetjs/core" "3.3.1" - "@buffetjs/styles" "3.3.1" - "@buffetjs/utils" "3.3.1" + "@buffetjs/core" "3.3.1-next.2" + "@buffetjs/styles" "3.3.1-next.2" + "@buffetjs/utils" "3.3.1-next.2" lodash "4.17.19" moment "^2.24.0" prop-types "^15.5.10" react-moment-proptypes "^1.7.0" -"@buffetjs/hooks@3.3.1": - version "3.3.1" - resolved "https://registry.yarnpkg.com/@buffetjs/hooks/-/hooks-3.3.1.tgz#1888c5c7bebb1be0c2e8b7d88e8149610f7cf129" - integrity sha512-aFTscNP3qKmAZNW7vqHeTIHwka6HhFQ/Z/0wJyfD8E52sMnPU0yJpXZgcDNyUjWisvYfZjJLqPowWIYuu4WFwA== +"@buffetjs/hooks@3.3.1-next.2": + version "3.3.1-next.2" + resolved "https://registry.yarnpkg.com/@buffetjs/hooks/-/hooks-3.3.1-next.2.tgz#32db4c2d4c61ed2de3a01569a6cb204d67ef2766" + integrity sha512-C5vNPTmDlriJwXARYuR9UuvCMq9/2f7y9kNzKmDLeCjEtpmvVP6gzvwQnmG+SjvN7eyDyFKOx0HBAu+dj7dfbg== -"@buffetjs/icons@3.3.1": - version "3.3.1" - resolved "https://registry.yarnpkg.com/@buffetjs/icons/-/icons-3.3.1.tgz#e066944b1b76409d07062e17629ff0a270ef3dd0" - integrity sha512-lkHUemQdB22rNaZbZBQZ1tTxJARD7JJa2LGm3GRQ4nfjP2MH2kf2xgm3UP/kCK+TOO8RRW+Cnn0UvVKhgzwQXw== +"@buffetjs/icons@3.3.1-next.2": + version "3.3.1-next.2" + resolved "https://registry.yarnpkg.com/@buffetjs/icons/-/icons-3.3.1-next.2.tgz#f7d0c51a7463db8571b70ba96121944866fa3137" + integrity sha512-lcmi3l7pazrykcf8akpLxAha+Ic7uEpmsLowwR7mUX51u0akVqrSzG6FShk/AaN+UNsGo6Gs3UlBldakrQO9QA== dependencies: prop-types "^15.5.10" -"@buffetjs/styles@3.3.1": - version "3.3.1" - resolved "https://registry.yarnpkg.com/@buffetjs/styles/-/styles-3.3.1.tgz#eaef219649357b958192d79d0d74e1b1debbbd97" - integrity sha512-CZiszfXpND3e1o50bG4rwDzU8uakHEjUjHgtJDeI3ZRlsWnFFjnmE8nHB43IPEaPmiIfmokAqNzNUzJ+NMI6Xw== +"@buffetjs/styles@3.3.1-next.2": + version "3.3.1-next.2" + resolved "https://registry.yarnpkg.com/@buffetjs/styles/-/styles-3.3.1-next.2.tgz#7165ae1f2f2c66d56b3fbc228e4a5517a974e878" + integrity sha512-udG1L1BIQcGCc8bmW0Q2gvtEg281HcA2WYr9Tr/n5UE6z8jk828eqvJQpjtfMxNquo9yRBR/zz4z52G7mYt2Dg== dependencies: "@fortawesome/fontawesome-free" "^5.12.0" "@fortawesome/fontawesome-svg-core" "^1.2.22" @@ -1098,10 +1098,10 @@ prop-types "^15.7.2" react-dates "^21.1.0" -"@buffetjs/utils@3.3.1": - version "3.3.1" - resolved "https://registry.yarnpkg.com/@buffetjs/utils/-/utils-3.3.1.tgz#903e29c8e69448418ec7bc940cf1c8eb104061c6" - integrity sha512-0EKrGc/yWNrI9w93HH0pM+EYTEsq98pf+vZOU8R2bWHXHeEodYC73Jr1wKwo7Z9ux/30Bmz5utgcHunnoj72SQ== +"@buffetjs/utils@3.3.1-next.2": + version "3.3.1-next.2" + resolved "https://registry.yarnpkg.com/@buffetjs/utils/-/utils-3.3.1-next.2.tgz#da72b8d4e47df60b5debc5e066380745d5908ff0" + integrity sha512-9+lWadHP75sTO0GLwgdrK6AEDA8a4MIQnTqAsIDnIbSutdUZSC8ieJdHX+YzN5T4DuMXrMW//AO264h46zXyvQ== dependencies: lodash "4.17.19" yup "^0.27.0"