fix: Multi group grant page becomes public when one of groups deleted #8518
Conversation
| }); | ||
|
|
||
| /* | ||
| * Update UserGroup | ||
| */ | ||
| test('Updated values should be reflected. (name, description, parent)', async() => { |
There was a problem hiding this comment.
ここら辺の既存部分への変更は、メソッド単位でテストを describe で囲んだだけです。
| const userGroupRelation12AfterRemove = await UserGroupRelation.findOne({ relatedGroup: userGroup12._id, relatedUser: userId1 }); | ||
| await expect(userGroupRelation11AfterRemove).toBeNull(); | ||
| await expect(userGroupRelation12AfterRemove).toBeNull(); | ||
| describe('removeCompletelyByRootGroupId', () => { |
There was a problem hiding this comment.
ここから下が新規テストになります。
arafubeatbox
changed the title
| @@ -1531,6 +1531,7 @@ describe('Page', () => { | |||
| // userB group remains, although options does not include it | |||
| { item: userGroupIdPModelB, type: GroupType.userGroup }, | |||
| ])); | |||
| expect(normalizeGrantedGroups(page.grantedGroups).length).toBe(3); | |||
There was a problem hiding this comment.
過去テスト補強:
expect.arrayContaining は array の中身に要素群がいるかを確認するだけで、完全一致かどうかは確認していなかったため、length の assertion を追加。
| @@ -196,14 +195,19 @@ export const UserGroupDeleteModal: FC<Props> = (props: Props) => { | |||
| </ModalBody> | |||
| <ModalFooter> | |||
| <form className="d-flex justify-content-between w-100" onSubmit={handleSubmit}> | |||
| <div className="d-flex mb-0"> | |||
| <div className="d-flex mb-0 me-3 "> | |||
| {renderPageActionSelector()} | ||
| {renderGroupSelector()} | ||
| </div> | ||
| <button type="submit" value="" className="btn btn-sm btn-danger text-nowrap" disabled={!validateForm()}> | ||
| <span className="material-symbols-outlined">delete_forever</span> {t('Delete')} | ||
| </button> | ||
| </form> | ||
| {actionName === 'public' && ( |
There was a problem hiding this comment.
ついでに public, delete, transfer を const (enum 的な) に変えてください
There was a problem hiding this comment.
PageActionOnGroupDelete を定義しました。
|
|
||
| switch (action) { | ||
| case 'public': | ||
| await Page.publicizePages(pages); | ||
| case 'public': { |
There was a problem hiding this comment.
PageActionOnGroupDelete を定義しました。
| }, | ||
| }; | ||
| }); | ||
| await Page.bulkWrite(queries); |
There was a problem hiding this comment.
Page.publicizePages の引数を拡張して groupsToDeleteIds を渡して、その中で updateOne クエリを変える方がよさそうだなあ
そうすると名前も publicize じゃない方がいいのかもしれない
There was a problem hiding this comment.
removeGroupsToDeleteFromPages として実装し直しました。
…e-becomes-public-when-one-of-groups-deleted
|
reg-suit detected visual differences. Check this report, and review them. 🔴🔴🔴🔴🔴🔴🔴🔴🔴🔴🔴🔴🔴🔴🔴🔴🔴🔴🔴🔴🔴🔴🔴🔴🔴🔴🔴🔴🔴🔴🔴🔴🔴🔴🔴🔴🔴🔴🔴🔴🔴🔴🔴🔴🔴 What do the circles mean?The number of circles represent the number of changed images.🔴 : Changed items, ⚪ : New items, ⚫ : Deleted items, and 🔵 Passed items How can I change the check status?If reviewers approve this PR, the reg context status will be green automatically. |
arafubeatbox
deleted the
fix/141309-141311-multi-group-grant-page-becomes-public-when-one-of-groups-deleted
branch
task
https://redmine.weseek.co.jp/issues/141311
管理画面イメージ
「公開可能なページを公開する」選択時のみ補足は表示される。
