Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

daily merge #3

Merged
merged 24 commits into from
May 28, 2024
Merged

daily merge #3

merged 24 commits into from
May 28, 2024

Conversation

jessetalk
Copy link

Description

Motivation

Key changes

  • Frontend
  • Backend

Test plan

Suggestions

Underlying risk

Showcase

jessetalk and others added 24 commits May 25, 2024 16:17
@jessetalk
Yun002 (#2)
219cb48 
* feat(independent-page): set independent-page

* feat(plugin): add fuzhijia clock plugin

* feat(clock): complete fuzhijia clock

* fix(clock): map issue after refreshing page

* fix(clock): tmap clock issue

* feat(wxcom-auth): add wxcom auth plugin

* fix(merge): merge from main

---------

Co-authored-by: jessetalk <>
@estheryo
Update README.md
4357e83
@estheryo
Update README.zh-CN.md
986a416
@estheryo
Update README.zh-CN.md
054f4e4
fix: numeric field display issue in form linkage rule (nocobase#4482)
8a86322 
* fix:  numeric field display issue in form linkage rule

* fix: bug
@actions-user
chore(versions): 😊 publish v1.0.0-alpha.16
2e7744f
@actions-user
chore: update changelog
8d7bc1f
@estheryo
Update README.md
c3cbf09
@estheryo
Update README.zh-CN.md
9ee9372
@estheryo
Update README.md
3851d49
@chareice
chore: database prepare error message
b576670
@chareice
chore: retry in dev env
eb0471f
refactor: form linkage rule to cancel assignment when multiple fields…
a3e4783 
… are selected (nocobase#4492)
@zhangzhonghe
fix: optimize data scope variable in permission configuration (nocoba…
13362da 
…se#4484)

* fix: optimize data scope variable in permission configuration

* test: add e2e test

* chore: fix failed e2e

* fix: optimize data scope variable in permission configuration

* chore: skip weird test
@chareice
fix: auto change log
4b6e301
@actions-user
chore(versions): 😊 publish v1.0.0-alpha.17
53eb054
@actions-user
chore: update changelog
b70528a
@zhouyanliang
feat: update LICENSE
5182496
fix: sub-table support allowAddNew setting (nocobase#4498)
02ebede
@2013xile
chore(auth): change char length limit of username to 1-50 (nocobase#4502
0adf5fb 
)
@zhangzhonghe
fix: fix loss of data scope field in permission configuration
a1909d9
@chareice @mytharcher
fix: after update event in single relation repository (nocobase#4503)
56dc06d 
* fix: after update event in single relation repository

* test(plugin-workflow): add association collection trigger

---------

Co-authored-by: mytharcher <mytharcher@gmail.com>
refactor: remove all frontend checks for isForeignKey (nocobase#4499)
9528da5 
* refactor: remove all frontend checks for isForeignKey

* fix: bug
@jessetalk
Merge branch 'nocobase:main' into main
0995542
@jessetalk jessetalk self-assigned this May 28, 2024
@jessetalk jessetalk merged commit 8a709cd into yun002 May 28, 2024
37 of 42 checks passed
@github-actions GitHub Actions
Copy link

Tests results for "E2E"

2 failed
❌ [chromium] › plugins/@nocobase/plugin-data-source-main/src/client/e2e/fields/number/schemaSettings.test.ts:46:7 › form item & create form › set default value
❌ [chromium] › plugins/@nocobase/plugin-data-source-main/src/client/e2e/fields/phone/schemaSettings.test.ts:45:7 › form item & create form › set default value

11 flaky ⚠️ [chromium] › plugins/@nocobase/plugin-acl/src/client/__e2e__/association.test.ts:245:5 › association block action permission
⚠️ [chromium] › plugins/@nocobase/plugin-action-bulk-edit/src/client/__e2e__/schemaSettings.test.ts:14:7 › bulk edit action setting › data will be updated && edit form configure
⚠️ [chromium] › core/client/src/modules/variable/__e2e__/basic.test.ts:14:7 › variables › linkage rules of table view action
⚠️ [chromium] › plugins/@nocobase/plugin-action-bulk-update/src/client/__e2e__/schemaSettings.test.ts:14:7 › data will be updated && Assign field values && after successful submission › data will be updated && Assign field values && after successful submission
⚠️ [chromium] › plugins/@nocobase/plugin-auth/src/client/__e2e__/auth.test.ts:21:7 › auth › register
⚠️ [chromium] › plugins/@nocobase/plugin-gantt/src/client/__e2e__/drag.test.ts:13:5 › drag and adjust start time, end time, and progress
⚠️ [chromium] › core/client/src/modules/blocks/data-blocks/list/__e2e__/schemaInitializer.test.ts:29:7 › where list block can be added › popup
⚠️ [chromium] › plugins/@nocobase/plugin-action-bulk-edit/src/client/__e2e__/schemaInitailizer.test.ts:14:7 › TableActionInitializers & GanttActionInitializers & MapActionInitializers should add bulk edit action › bulk edit in TableActionInitializers
⚠️ [chromium] › plugins/@nocobase/plugin-workflow/src/client/__e2e__/conditionNode/BranchIntoYesAndNoFormulaEngine.test.ts:380:5 › Collection event Add Data Trigger, determines that the trigger node single line text field variable is not equal to an unequal constant, passes.
⚠️ [chromium] › core/client/src/modules/blocks/data-blocks/grid-card/__e2e__/schemaInitializer.test.ts:30:7 › where grid card block can be added › popup
⚠️ [chromium] › plugins/@nocobase/plugin-calendar/src/client/__e2e__/schemaInitializer.test.ts:14:7 › where can be added › page

919 passed, 28 skipped
✔️✔️✔️

Full HTML report. Merge workflow run.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@jessetalk jessetalk

Labels
None yet
Projects
None yet
Milestone
No milestone
7 participants
@jessetalk @estheryo @actions-user @chareice @zhangzhonghe @zhouyanliang @2013xile