Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/main' into fix/audit-log-table
Browse files Browse the repository at this point in the history
  • Loading branch information
@remidej
remidej committed Feb 7, 2023
2 parents 3b0309b + 0072ce9 commit 337df63
Show file tree
Hide file tree
Showing 103 changed files with 3,506 additions and 3,954 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/issues_handleLabel.yml
View file
Expand Up @@ -196,7 +196,7 @@ jobs:
with:
project-url: https://github.com/orgs/strapi/projects/13
github-token: ${{ secrets.PROJECT_TRANSFER_TOKEN }}
labeled: 'source: core:content-type-builder, source: core:database, source: core:email, source: core:strapi, source: core:utils, source: plugin:graphql, source: plugin:users-permissions, source: typescript'
labeled: 'source: core:content-type-builder, source: core:database, source: core:email, source: core:strapi, source: core:utils, source: plugin:graphql, source: plugin:users-permissions, source: typescript, source: core:data-transfer'
label-operator: OR
- name: assign issues to Expansions squad project
uses: actions/add-to-project@v0.3.0
Expand Down
6 changes: 3 additions & 3 deletions docs/yarn.lock
View file
Expand Up @@ -4736,9 +4736,9 @@ htmlparser2@^8.0.1:
entities "^4.3.0"

http-cache-semantics@^4.0.0:
version "4.1.0"
resolved "https://registry.yarnpkg.com/http-cache-semantics/-/http-cache-semantics-4.1.0.tgz#49e91c5cbf36c9b94bcfcd71c23d5249ec74e390"
integrity sha512-carPklcUh7ROWRK7Cv27RPtdhYhUsela/ue5/jKzjegVvXDqM2ILE9Q2BGn9JZJh1g87cp56su/FgQSzcWS8cQ==
version "4.1.1"
resolved "https://registry.yarnpkg.com/http-cache-semantics/-/http-cache-semantics-4.1.1.tgz#abe02fcb2985460bf0323be664436ec3476a6d5a"
integrity sha512-er295DKPVsV82j5kw1Gjt+ADA/XYHsajl82cGNQG2eyoPkvgUhX+nDIyelzhIWbbsXP39EHcI6l5tYs2FYqYXQ==

http-deceiver@^1.2.7:
version "1.2.7"
Expand Down
1 change: 1 addition & 0 deletions jest.base-config.front.js
View file
Expand Up @@ -30,6 +30,7 @@ module.exports = {
moduleNameMapper,
collectCoverageFrom: [
'<rootDir>/packages/core/*/admin/src/**/*.js',
'<rootDir>/packages/core/admin/ee/admin/**/*.js',
'<rootDir>/packages/plugins/*/admin/src/**/*.js',
],
testPathIgnorePatterns: [
Expand Down
38 changes: 4 additions & 34 deletions ...ages/core/admin/admin/src/components/GuidedTour/Homepage/components/tests/Stepper.test.js
View file
Expand Up @@ -177,8 +177,6 @@ describe('GuidedTour Stepper', () => {
>
<div
class="c2 c3"
height="1.875rem"
width="1.875rem"
>
<span
class="c4"
Expand All @@ -201,8 +199,6 @@ describe('GuidedTour Stepper', () => {
>
<div
class="c8"
height="100%"
width="0.125rem"
/>
</div>
<div
Expand All @@ -225,8 +221,6 @@ describe('GuidedTour Stepper', () => {
>
<div
class="c10 c3"
height="1.875rem"
width="1.875rem"
>
<span
class="c11"
Expand All @@ -249,8 +243,6 @@ describe('GuidedTour Stepper', () => {
>
<div
class="c12"
height="100%"
width="0.125rem"
/>
</div>
<div
Expand All @@ -269,8 +261,6 @@ describe('GuidedTour Stepper', () => {
>
<div
class="c10 c3"
height="1.875rem"
width="1.875rem"
>
<span
class="c11"
Expand Down Expand Up @@ -446,16 +436,14 @@ describe('GuidedTour Stepper', () => {
>
<div
class="c2 c3"
height="1.875rem"
width="1.875rem"
>
<svg
aria-hidden="true"
class="c4 c5"
fill="none"
height="1em"
viewBox="0 0 24 24"
width="1rem"
width="1em"
xmlns="http://www.w3.org/2000/svg"
>
<path
Expand All @@ -479,8 +467,6 @@ describe('GuidedTour Stepper', () => {
>
<div
class="c9"
height="100%"
width="0.125rem"
/>
</div>
<div
Expand All @@ -499,8 +485,6 @@ describe('GuidedTour Stepper', () => {
>
<div
class="c2 c3"
height="1.875rem"
width="1.875rem"
>
<span
class="c11"
Expand All @@ -523,8 +507,6 @@ describe('GuidedTour Stepper', () => {
>
<div
class="c12"
height="100%"
width="0.125rem"
/>
</div>
<div
Expand All @@ -547,8 +529,6 @@ describe('GuidedTour Stepper', () => {
>
<div
class="c13 c3"
height="1.875rem"
width="1.875rem"
>
<span
class="c14"
Expand Down Expand Up @@ -692,16 +672,14 @@ describe('GuidedTour Stepper', () => {
>
<div
class="c2 c3"
height="1.875rem"
width="1.875rem"
>
<svg
aria-hidden="true"
class="c4 c5"
fill="none"
height="1em"
viewBox="0 0 24 24"
width="1rem"
width="1em"
xmlns="http://www.w3.org/2000/svg"
>
<path
Expand All @@ -725,8 +703,6 @@ describe('GuidedTour Stepper', () => {
>
<div
class="c9"
height="100%"
width="0.125rem"
/>
</div>
<div
Expand All @@ -745,16 +721,14 @@ describe('GuidedTour Stepper', () => {
>
<div
class="c2 c3"
height="1.875rem"
width="1.875rem"
>
<svg
aria-hidden="true"
class="c4 c5"
fill="none"
height="1em"
viewBox="0 0 24 24"
width="1rem"
width="1em"
xmlns="http://www.w3.org/2000/svg"
>
<path
Expand All @@ -778,8 +752,6 @@ describe('GuidedTour Stepper', () => {
>
<div
class="c9"
height="100%"
width="0.125rem"
/>
</div>
<div
Expand All @@ -798,16 +770,14 @@ describe('GuidedTour Stepper', () => {
>
<div
class="c2 c3"
height="1.875rem"
width="1.875rem"
>
<svg
aria-hidden="true"
class="c4 c5"
fill="none"
height="1em"
viewBox="0 0 24 24"
width="1rem"
width="1em"
xmlns="http://www.w3.org/2000/svg"
>
<path
Expand Down
11 changes: 0 additions & 11 deletions packages/core/admin/admin/src/components/GuidedTour/Homepage/tests/index.test.js
View file
Expand Up @@ -439,7 +439,6 @@ describe('GuidedTour Homepage', () => {
>
<div
class="c0 c2 c3"
spacing="6"
>
<h2
class="c4 c5"
Expand All @@ -460,8 +459,6 @@ describe('GuidedTour Homepage', () => {
>
<div
class="c0 c8 c9"
height="1.875rem"
width="1.875rem"
>
<span
class="c4 c10"
Expand All @@ -484,8 +481,6 @@ describe('GuidedTour Homepage', () => {
>
<div
class="c0 c14"
height="100%"
width="0.125rem"
/>
</div>
<div
Expand Down Expand Up @@ -534,8 +529,6 @@ describe('GuidedTour Homepage', () => {
>
<div
class="c0 c20 c9"
height="1.875rem"
width="1.875rem"
>
<span
class="c4 c21"
Expand All @@ -558,8 +551,6 @@ describe('GuidedTour Homepage', () => {
>
<div
class="c0 c22"
height="100%"
width="0.125rem"
/>
</div>
<div
Expand All @@ -578,8 +569,6 @@ describe('GuidedTour Homepage', () => {
>
<div
class="c0 c20 c9"
height="1.875rem"
width="1.875rem"
>
<span
class="c4 c21"
Expand Down
7 changes: 0 additions & 7 deletions packages/core/admin/admin/src/components/GuidedTour/Modal/tests/index.test.js
View file
Expand Up @@ -542,8 +542,6 @@ describe('<GuidedTourModal />', () => {
aria-modal="true"
class="c1 c5 c6 c7"
role="dialog"
spacing="8"
width="41.25rem"
>
<div
class="c1 c8"
Expand Down Expand Up @@ -585,8 +583,6 @@ describe('<GuidedTourModal />', () => {
>
<div
class="c1 c14"
height="100%"
width="0.125rem"
/>
</div>
<span
Expand All @@ -606,8 +602,6 @@ describe('<GuidedTourModal />', () => {
>
<div
class="c1 c19 c3"
height="1.875rem"
width="1.875rem"
>
<span
class="c15 c20"
Expand Down Expand Up @@ -635,7 +629,6 @@ describe('<GuidedTourModal />', () => {
>
<div
class="c1 c23 c6 c24"
spacing="4"
>
<span
class="c15 c25"
Expand Down
2 changes: 0 additions & 2 deletions packages/core/admin/admin/src/components/Notifications/tests/index.test.js
View file
Expand Up @@ -67,8 +67,6 @@ describe('<Notifications />', () => {
<div
class="c0 c1 c2"
spacing="2"
width="31.25rem"
/>
`);
});
Expand Down
2 changes: 1 addition & 1 deletion ...mponents/DynamicTable/CellContent/RelationMultiple/tests/__snapshots__/index.test.js.snap
View file
Expand Up @@ -239,7 +239,7 @@ exports[`DynamicTable / Cellcontent / RelationMultiple renders and matches the s
>
<div>
<button
aria-controls="simplemenu-1"
aria-controls="0"
aria-disabled="false"
aria-expanded="false"
aria-haspopup="true"
Expand Down

0 comments on commit 337df63

Please sign in to comment.