Skip to content

Commit

Permalink
Merge branch 'main' into chore/rbac-ce
Browse files Browse the repository at this point in the history
  • Loading branch information
@alexandrebodin
alexandrebodin committed Mar 13, 2023
2 parents 4f462fb + 959cf6c commit 2eb85b1
Show file tree
Hide file tree
Showing 14 changed files with 60 additions and 38 deletions.
8 changes: 7 additions & 1 deletion ...re/admin/admin/src/content-manager/components/EditViewDataManagerProvider/utils/schema.js
View file
Expand Up @@ -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);

Expand All @@ -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;
});
Expand Down
8 changes: 0 additions & 8 deletions packages/core/admin/admin/src/content-manager/utils/createDefaultForm.js
View file
Expand Up @@ -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;
}
Expand Down
5 changes: 0 additions & 5 deletions packages/core/admin/admin/src/content-manager/utils/tests/createDefaultForm.test.js
View file
Expand Up @@ -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: [],
Expand Down
1 change: 1 addition & 0 deletions packages/core/admin/admin/src/pages/SettingsPage/components/Tokens/FormHead/index.js
View file
Expand Up @@ -69,6 +69,7 @@ const FormHead = ({
})}
</Link>
}
ellipsis
/>
);
};
Expand Down
4 changes: 2 additions & 2 deletions packages/core/admin/admin/src/pages/SettingsPage/components/Tokens/Table/index.js
View file
Expand Up @@ -63,8 +63,8 @@ const Table = ({
condition: canUpdate,
})}
>
<Td>
<Typography textColor="neutral800" fontWeight="bold">
<Td maxWidth={pxToRem(250)}>
<Typography textColor="neutral800" fontWeight="bold" ellipsis>
{token.name}
</Typography>
</Td>
Expand Down
8 changes: 8 additions & 0 deletions ...in/src/pages/SettingsPage/pages/ApiTokens/EditView/tests/__snapshots__/index.test.js.snap
View file
Expand Up @@ -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;
}
Expand Down Expand Up @@ -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;
}
Expand Down
2 changes: 1 addition & 1 deletion packages/core/admin/admin/src/pages/SettingsPage/pages/ApiTokens/EditView/utils/schema.js
View file
Expand Up @@ -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'])
Expand Down
14 changes: 9 additions & 5 deletions ...ages/core/admin/admin/src/pages/SettingsPage/pages/ApiTokens/ListView/tests/index.test.js
View file
Expand Up @@ -158,7 +158,7 @@ describe('ADMIN | Pages | API TOKENS | ListPage', () => {
cursor: pointer;
}
.c36 {
.c35 {
max-width: 15.625rem;
}
Expand Down Expand Up @@ -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;
}
Expand Down Expand Up @@ -919,19 +923,19 @@ describe('ADMIN | Pages | API TOKENS | ListPage', () => {
>
<td
aria-colindex="1"
class="c25"
class="c35 c25"
role="gridcell"
tabindex="-1"
>
<span
class="c5 c35"
class="c5 c36"
>
My super token
</span>
</td>
<td
aria-colindex="2"
class="c36 c25"
class="c35 c25"
role="gridcell"
tabindex="-1"
>
Expand Down
8 changes: 8 additions & 0 deletions ...c/pages/SettingsPage/pages/TransferTokens/EditView/tests/__snapshots__/index.test.js.snap
View file
Expand Up @@ -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;
}
Expand Down Expand Up @@ -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;
}
Expand Down
2 changes: 1 addition & 1 deletion ...ges/core/admin/admin/src/pages/SettingsPage/pages/TransferTokens/EditView/utils/schema.js
View file
Expand Up @@ -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),
});
Expand Down
14 changes: 9 additions & 5 deletions ...core/admin/admin/src/pages/SettingsPage/pages/TransferTokens/ListView/tests/index.test.js
View file
Expand Up @@ -158,7 +158,7 @@ describe('ADMIN | Pages | TRANSFER TOKENS | ListPage', () => {
cursor: pointer;
}
.c36 {
.c35 {
max-width: 15.625rem;
}
Expand Down Expand Up @@ -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;
}
Expand Down Expand Up @@ -919,19 +923,19 @@ describe('ADMIN | Pages | TRANSFER TOKENS | ListPage', () => {
>
<td
aria-colindex="1"
class="c25"
class="c35 c25"
role="gridcell"
tabindex="-1"
>
<span
class="c5 c35"
class="c5 c36"
>
My super token
</span>
</td>
<td
aria-colindex="2"
class="c36 c25"
class="c35 c25"
role="gridcell"
tabindex="-1"
>
Expand Down
19 changes: 10 additions & 9 deletions ...core/helper-plugin/lib/src/components/DateTimePicker/DateTimePicker.stories.mdx
View file
Expand Up @@ -4,20 +4,20 @@ import { useState } from 'react';
import { Meta, Story, Canvas } from '@storybook/addon-docs/blocks';
import DateTimePicker from './index';

<Meta
title="components/DateTimePicker"
<Meta
title="components/DateTimePicker"
component={DateTimePicker}
argTypes={{
label: {
control: {
type: 'text'
}
control: {
type: 'text',
},
},
value: {
control: {
type: 'date'
}
}
type: 'date',
},
},
}}
/>

Expand All @@ -37,7 +37,7 @@ Description...
<DateTimePicker
onClear={() => setValue(undefined)}
value={value}
onChange={e => setValue(e)}
onChange={(e) => setValue(e)}
label="Date time picker"
hint="This is a super description"
/>
Expand All @@ -53,6 +53,7 @@ Description...
<Canvas>
<Story name="error">
<DateTimePicker
label="Date time picker"
hint="This is a super description"
error="Very very very very very very very long error"
/>
Expand Down
2 changes: 2 additions & 0 deletions ...ugin/lib/src/components/FilterPopoverURLQuery/FilterPopoverURLQuery.stories.mdx
View file
Expand Up @@ -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';

Expand Down Expand Up @@ -51,6 +52,7 @@ import { FilterListURLQuery } from '@strapi/helper-plugin';
metadatas: { label: 'city' },
},
];
const { trackUsage } = useTracking();
return (
<Main>
<Flex direction="column" alignItems="stretch" gap={6}>
Expand Down
3 changes: 2 additions & 1 deletion packages/core/helper-plugin/lib/src/components/GenericInput/index.js
View file
Expand Up @@ -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)}
Expand Down

0 comments on commit 2eb85b1

Please sign in to comment.