diff --git a/packages/core/admin/admin/src/content-manager/components/EditViewDataManagerProvider/utils/schema.js b/packages/core/admin/admin/src/content-manager/components/EditViewDataManagerProvider/utils/schema.js index 52bb5bb2f4..2cb2204fe9 100644 --- a/packages/core/admin/admin/src/content-manager/components/EditViewDataManagerProvider/utils/schema.js +++ b/packages/core/admin/admin/src/content-manager/components/EditViewDataManagerProvider/utils/schema.js @@ -216,6 +216,10 @@ const createYupSchemaAttribute = (type, validations, options) => { schema = yup .mixed(errorsTrads.json) .test('isJSON', errorsTrads.json, (value) => { + if (!value || !value.length) { + return true; + } + try { JSON.parse(value); @@ -226,7 +230,9 @@ const createYupSchemaAttribute = (type, validations, options) => { }) .nullable() .test('required', errorsTrads.required, (value) => { - if (validations.required && !value.length) return false; + if (validations.required && (!value || !value.length)) { + return false; + } return true; }); diff --git a/packages/core/admin/admin/src/content-manager/utils/createDefaultForm.js b/packages/core/admin/admin/src/content-manager/utils/createDefaultForm.js index 3b50f33ae8..65ee4315b3 100644 --- a/packages/core/admin/admin/src/content-manager/utils/createDefaultForm.js +++ b/packages/core/admin/admin/src/content-manager/utils/createDefaultForm.js @@ -5,14 +5,6 @@ const createDefaultForm = (attributes, allComponentsSchema) => { const attribute = get(attributes, [current], {}); const { default: defaultValue, component, type, required, min, repeatable } = attribute; - if (type === 'json') { - acc[current] = null; - } - - if (type === 'json' && required === true) { - acc[current] = {}; - } - if (defaultValue !== undefined) { acc[current] = defaultValue; } diff --git a/packages/core/admin/admin/src/content-manager/utils/tests/createDefaultForm.test.js b/packages/core/admin/admin/src/content-manager/utils/tests/createDefaultForm.test.js index f5431024d6..b14a4da65f 100644 --- a/packages/core/admin/admin/src/content-manager/utils/tests/createDefaultForm.test.js +++ b/packages/core/admin/admin/src/content-manager/utils/tests/createDefaultForm.test.js @@ -11,11 +11,6 @@ describe('CONTENT MANAGER | utils | createDefaultForm', () => { expect(createDefaultForm(attributes, {})).toEqual({}); }); - it('should set the json type with the correct value', () => { - expect(createDefaultForm({ test: { type: 'json' } }, {})).toEqual({ test: null }); - expect(createDefaultForm({ test: { type: 'json', required: true } }, {})).toEqual({ test: {} }); - }); - it('should init the requide dynamic zone type with an empty array', () => { expect(createDefaultForm({ test: { type: 'dynamiczone', required: true } })).toEqual({ test: [], diff --git a/packages/core/admin/admin/src/pages/SettingsPage/components/Tokens/FormHead/index.js b/packages/core/admin/admin/src/pages/SettingsPage/components/Tokens/FormHead/index.js index c151aa5a53..8469c2a1db 100644 --- a/packages/core/admin/admin/src/pages/SettingsPage/components/Tokens/FormHead/index.js +++ b/packages/core/admin/admin/src/pages/SettingsPage/components/Tokens/FormHead/index.js @@ -69,6 +69,7 @@ const FormHead = ({ })} } + ellipsis /> ); }; diff --git a/packages/core/admin/admin/src/pages/SettingsPage/components/Tokens/Table/index.js b/packages/core/admin/admin/src/pages/SettingsPage/components/Tokens/Table/index.js index 03a8bb13e8..f46a0765a3 100644 --- a/packages/core/admin/admin/src/pages/SettingsPage/components/Tokens/Table/index.js +++ b/packages/core/admin/admin/src/pages/SettingsPage/components/Tokens/Table/index.js @@ -63,8 +63,8 @@ const Table = ({ condition: canUpdate, })} > - - + + {token.name} diff --git a/packages/core/admin/admin/src/pages/SettingsPage/pages/ApiTokens/EditView/tests/__snapshots__/index.test.js.snap b/packages/core/admin/admin/src/pages/SettingsPage/pages/ApiTokens/EditView/tests/__snapshots__/index.test.js.snap index 4ee19aab43..0f8548959e 100644 --- a/packages/core/admin/admin/src/pages/SettingsPage/pages/ApiTokens/EditView/tests/__snapshots__/index.test.js.snap +++ b/packages/core/admin/admin/src/pages/SettingsPage/pages/ApiTokens/EditView/tests/__snapshots__/index.test.js.snap @@ -275,6 +275,10 @@ exports[`ADMIN | Pages | API TOKENS | EditView renders and matches the snapshot font-weight: 600; font-size: 2rem; line-height: 1.25; + display: block; + white-space: nowrap; + overflow: hidden; + text-overflow: ellipsis; color: #32324d; } @@ -1824,6 +1828,10 @@ exports[`ADMIN | Pages | API TOKENS | EditView renders and matches the snapshot font-weight: 600; font-size: 2rem; line-height: 1.25; + display: block; + white-space: nowrap; + overflow: hidden; + text-overflow: ellipsis; color: #32324d; } diff --git a/packages/core/admin/admin/src/pages/SettingsPage/pages/ApiTokens/EditView/utils/schema.js b/packages/core/admin/admin/src/pages/SettingsPage/pages/ApiTokens/EditView/utils/schema.js index 4d6686c7ec..626080eef1 100644 --- a/packages/core/admin/admin/src/pages/SettingsPage/pages/ApiTokens/EditView/utils/schema.js +++ b/packages/core/admin/admin/src/pages/SettingsPage/pages/ApiTokens/EditView/utils/schema.js @@ -2,7 +2,7 @@ import * as yup from 'yup'; import { translatedErrors } from '@strapi/helper-plugin'; const schema = yup.object().shape({ - name: yup.string(translatedErrors.string).required(translatedErrors.required), + name: yup.string(translatedErrors.string).max(100).required(translatedErrors.required), type: yup .string(translatedErrors.string) .oneOf(['read-only', 'full-access', 'custom']) diff --git a/packages/core/admin/admin/src/pages/SettingsPage/pages/ApiTokens/ListView/tests/index.test.js b/packages/core/admin/admin/src/pages/SettingsPage/pages/ApiTokens/ListView/tests/index.test.js index 378599e5b0..8332f8bc08 100644 --- a/packages/core/admin/admin/src/pages/SettingsPage/pages/ApiTokens/ListView/tests/index.test.js +++ b/packages/core/admin/admin/src/pages/SettingsPage/pages/ApiTokens/ListView/tests/index.test.js @@ -158,7 +158,7 @@ describe('ADMIN | Pages | API TOKENS | ListPage', () => { cursor: pointer; } - .c36 { + .c35 { max-width: 15.625rem; } @@ -255,9 +255,13 @@ describe('ADMIN | Pages | API TOKENS | ListPage', () => { color: #666687; } - .c35 { + .c36 { font-size: 0.875rem; line-height: 1.43; + display: block; + white-space: nowrap; + overflow: hidden; + text-overflow: ellipsis; font-weight: 600; color: #32324d; } @@ -919,19 +923,19 @@ describe('ADMIN | Pages | API TOKENS | ListPage', () => { > My super token diff --git a/packages/core/admin/admin/src/pages/SettingsPage/pages/TransferTokens/EditView/tests/__snapshots__/index.test.js.snap b/packages/core/admin/admin/src/pages/SettingsPage/pages/TransferTokens/EditView/tests/__snapshots__/index.test.js.snap index 2b867897e1..b89664e31e 100644 --- a/packages/core/admin/admin/src/pages/SettingsPage/pages/TransferTokens/EditView/tests/__snapshots__/index.test.js.snap +++ b/packages/core/admin/admin/src/pages/SettingsPage/pages/TransferTokens/EditView/tests/__snapshots__/index.test.js.snap @@ -148,6 +148,10 @@ exports[`ADMIN | Pages | TRANSFER TOKENS | EditView renders and matches the snap font-weight: 600; font-size: 2rem; line-height: 1.25; + display: block; + white-space: nowrap; + overflow: hidden; + text-overflow: ellipsis; color: #32324d; } @@ -1121,6 +1125,10 @@ exports[`ADMIN | Pages | TRANSFER TOKENS | EditView renders and matches the snap font-weight: 600; font-size: 2rem; line-height: 1.25; + display: block; + white-space: nowrap; + overflow: hidden; + text-overflow: ellipsis; color: #32324d; } diff --git a/packages/core/admin/admin/src/pages/SettingsPage/pages/TransferTokens/EditView/utils/schema.js b/packages/core/admin/admin/src/pages/SettingsPage/pages/TransferTokens/EditView/utils/schema.js index ccaded4103..ca6efd5060 100644 --- a/packages/core/admin/admin/src/pages/SettingsPage/pages/TransferTokens/EditView/utils/schema.js +++ b/packages/core/admin/admin/src/pages/SettingsPage/pages/TransferTokens/EditView/utils/schema.js @@ -2,7 +2,7 @@ import * as yup from 'yup'; import { translatedErrors } from '@strapi/helper-plugin'; const schema = yup.object().shape({ - name: yup.string(translatedErrors.string).required(translatedErrors.required), + name: yup.string(translatedErrors.string).max(100).required(translatedErrors.required), description: yup.string().nullable(), lifespan: yup.number().integer().min(0).nullable().defined(translatedErrors.required), }); diff --git a/packages/core/admin/admin/src/pages/SettingsPage/pages/TransferTokens/ListView/tests/index.test.js b/packages/core/admin/admin/src/pages/SettingsPage/pages/TransferTokens/ListView/tests/index.test.js index f636d2f77a..354d465e0c 100644 --- a/packages/core/admin/admin/src/pages/SettingsPage/pages/TransferTokens/ListView/tests/index.test.js +++ b/packages/core/admin/admin/src/pages/SettingsPage/pages/TransferTokens/ListView/tests/index.test.js @@ -158,7 +158,7 @@ describe('ADMIN | Pages | TRANSFER TOKENS | ListPage', () => { cursor: pointer; } - .c36 { + .c35 { max-width: 15.625rem; } @@ -255,9 +255,13 @@ describe('ADMIN | Pages | TRANSFER TOKENS | ListPage', () => { color: #666687; } - .c35 { + .c36 { font-size: 0.875rem; line-height: 1.43; + display: block; + white-space: nowrap; + overflow: hidden; + text-overflow: ellipsis; font-weight: 600; color: #32324d; } @@ -919,19 +923,19 @@ describe('ADMIN | Pages | TRANSFER TOKENS | ListPage', () => { > My super token diff --git a/packages/core/helper-plugin/lib/src/components/DateTimePicker/DateTimePicker.stories.mdx b/packages/core/helper-plugin/lib/src/components/DateTimePicker/DateTimePicker.stories.mdx index 1cdb400c9d..d14885fc05 100644 --- a/packages/core/helper-plugin/lib/src/components/DateTimePicker/DateTimePicker.stories.mdx +++ b/packages/core/helper-plugin/lib/src/components/DateTimePicker/DateTimePicker.stories.mdx @@ -4,20 +4,20 @@ import { useState } from 'react'; import { Meta, Story, Canvas } from '@storybook/addon-docs/blocks'; import DateTimePicker from './index'; - @@ -37,7 +37,7 @@ Description... setValue(undefined)} value={value} - onChange={e => setValue(e)} + onChange={(e) => setValue(e)} label="Date time picker" hint="This is a super description" /> @@ -53,6 +53,7 @@ Description... diff --git a/packages/core/helper-plugin/lib/src/components/FilterPopoverURLQuery/FilterPopoverURLQuery.stories.mdx b/packages/core/helper-plugin/lib/src/components/FilterPopoverURLQuery/FilterPopoverURLQuery.stories.mdx index 57cb9696b8..f44e62da47 100644 --- a/packages/core/helper-plugin/lib/src/components/FilterPopoverURLQuery/FilterPopoverURLQuery.stories.mdx +++ b/packages/core/helper-plugin/lib/src/components/FilterPopoverURLQuery/FilterPopoverURLQuery.stories.mdx @@ -4,6 +4,7 @@ import { useEffect, useState, useRef } from 'react'; import { Meta, ArgsTable, Canvas, Story } from '@storybook/addon-docs'; import { Button, Box, Main, Flex } from '@strapi/design-system'; import useQueryParams from '../../hooks/useQueryParams'; +import useTracking from '../../hooks/useTracking'; import FilterListURLQuery from '../FilterListURLQuery'; import FilterPopoverURLQuery from './index'; @@ -51,6 +52,7 @@ import { FilterListURLQuery } from '@strapi/helper-plugin'; metadatas: { label: 'city' }, }, ]; + const { trackUsage } = useTracking(); return (
diff --git a/packages/core/helper-plugin/lib/src/components/GenericInput/index.js b/packages/core/helper-plugin/lib/src/components/GenericInput/index.js index d9bedf7b7f..8e351391ac 100644 --- a/packages/core/helper-plugin/lib/src/components/GenericInput/index.js +++ b/packages/core/helper-plugin/lib/src/components/GenericInput/index.js @@ -142,11 +142,12 @@ const GenericInput = ({ labelAction={labelAction} value={value} error={errorMessage} + disabled={disabled} hint={hint} required={required} onChange={(json) => { // Default to null when the field is not required and there is no input value - const value = !attribute.required && !json.length ? 'null' : json; + const value = !attribute.required && !json.length ? null : json; onChange({ target: { name, value } }); }} minHeight={pxToRem(252)}