fix: Unable to select group viewing permissions #9541

miya · 2025-01-08T03:01:16Z

Task

#159935 ページ編集画面で group の閲覧権限を選択できない
- #159936 修正

…al null in page route

changeset-bot · 2025-01-08T03:01:20Z

⚠️ No Changeset found

Latest commit: ac27a76

Merging this PR will not cause a version bump for any packages. If these changes should not result in a new version, you're good to go. If these changes should result in a version bump, you need to add a changeset.

This PR includes no changesets

When changesets are added to this PR, you'll see the packages that this PR includes changesets for and the associated semver types

Click here to learn what changesets are, and how to add one.

Click here if you're a maintainer who wants to add a changeset to this PR

miya · 2025-01-08T03:04:10Z

apps/app/src/server/routes/apiv3/page/index.ts

@@ -530,7 +530,7 @@ module.exports = (crowi) => {
    } = page;
    let isGrantNormalized = false;
    try {
-      const grantedUsersId = grantedUsers.map(ref => getIdForRef(ref));
+      const grantedUsersId = grantedUsers?.map(ref => getIdForRef(ref));


バグの原因は page.grantedUsers が null の時に null 許容の実装になっていないことから 500 エラーが返却されることが原因だった。

@growi/app:dev: 02:28:35.201Z ERROR growi:routes:apiv3:page: @growi/app:dev: Error occurred while processing isGrantNormalized. TypeError: Cannot read properties of null (reading 'map') @growi/app:dev: at /workspace/growi/apps/app/src/server/routes/apiv3/page/index.ts:533:43 @growi/app:dev: at processTicksAndRejections (node:internal/process/task_queues:95:5) @growi/app:dev: GET /_api/v3/page/grant-data?pageId=62a1a77c6efd10033d9504cb 500 7.355 ms - 85

miya · 2025-01-08T03:35:20Z

packages/core/src/interfaces/page.ts

@@ -28,7 +28,7 @@ export type IPage = {
  descendantCount: number,
  isEmpty: boolean,
  grant: PageGrant,
-  grantedUsers: Ref<IUser>[],
+  grantedUsers?: Ref<IUser>[],


null 許容型に変更

miya · 2025-01-08T03:44:58Z

apps/app/src/server/service/page-grant.ts

type IPage の改修による変更

miya · 2025-01-08T03:45:02Z

apps/app/src/server/service/page/index.ts

type IPage の改修による変更

miya · 2025-01-08T03:45:06Z

apps/app/src/server/service/search-delegator/elasticsearch.ts

type IPage の改修による変更

This reverts commit b51f27f.

… potential null in page route" This reverts commit a92911c.

yuki-takei · 2025-01-08T09:31:38Z

apps/app/src/server/service/normalize-data/convert-null-to-empty-granted-arrays.ts

+  const requests = [
+    {
+      updateMany: {
+        filter: { grantedUsers: null },


filter: { $or: [ { grantedGroups: null }, { grantedGroups: { $exists: false } } ] }

にしないと、フィールドが存在しない場合は filter に引っかからないんじゃないかな

item: null は null or 存在しないフィールドにマッチするようです。(手元で動作確認もしました)

The { item : null } query matches documents that either contain the item field whose value is null or that do not contain the item field.

https://www.mongodb.com/docs/manual/tutorial/query-for-null-fields/#equality-filter

miya · 2025-01-09T02:17:05Z

@mergify queue

mergify · 2025-01-09T02:17:21Z

queue

✅ The pull request has been merged automatically

The pull request has been merged automatically at cc7a2bc

fix: make grantedUsers optional in IPage interface and handle potenti…

a92911c

…al null in page route

miya requested a review from yuki-takei January 8, 2025 03:01

miya self-assigned this Jan 8, 2025

github-actions bot added the type/bug label Jan 8, 2025

miya marked this pull request as ready for review January 8, 2025 03:01

nullable

b51f27f

miya commented Jan 8, 2025

View reviewed changes

miya added 3 commits January 8, 2025 07:40

Revert "nullable"

903e5c6

This reverts commit b51f27f.

Revert "fix: make grantedUsers optional in IPage interface and handle…

d43bb39

… potential null in page route" This reverts commit a92911c.

impl convertNullToEmptyGrantedArrays

7606aac

yuki-takei requested changes Jan 8, 2025

View reviewed changes

Add comment

ac27a76

mergify bot added a commit that referenced this pull request Jan 9, 2025

Merge of #9541

7c60071

mergify bot mentioned this pull request Jan 9, 2025

merge queue: embarking master (3f4b773) and #9541 together #9543

Closed

15 tasks

mergify bot merged commit cc7a2bc into master Jan 9, 2025
21 checks passed

mergify bot deleted the fix/159936-unable-to-select-group-viewing-permissions branch January 9, 2025 02:31

github-actions bot mentioned this pull request Jan 9, 2025

Release v7.1.7 #9524

Open

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

fix: Unable to select group viewing permissions #9541

fix: Unable to select group viewing permissions #9541

miya commented Jan 8, 2025

changeset-bot bot commented Jan 8, 2025 •

edited

Loading

miya Jan 8, 2025

miya Jan 8, 2025

miya Jan 8, 2025

miya Jan 8, 2025

miya Jan 8, 2025

yuki-takei Jan 8, 2025

miya Jan 9, 2025

miya commented Jan 9, 2025

mergify bot commented Jan 9, 2025 •

edited

Loading

fix: Unable to select group viewing permissions #9541

fix: Unable to select group viewing permissions #9541

Conversation

miya commented Jan 8, 2025

Task

changeset-bot bot commented Jan 8, 2025 • edited Loading

⚠️ No Changeset found

miya Jan 8, 2025

Choose a reason for hiding this comment

miya Jan 8, 2025

Choose a reason for hiding this comment

miya Jan 8, 2025

Choose a reason for hiding this comment

miya Jan 8, 2025

Choose a reason for hiding this comment

miya Jan 8, 2025

Choose a reason for hiding this comment

yuki-takei Jan 8, 2025

Choose a reason for hiding this comment

miya Jan 9, 2025

Choose a reason for hiding this comment

miya commented Jan 9, 2025

mergify bot commented Jan 9, 2025 • edited Loading

✅ The pull request has been merged automatically

changeset-bot bot commented Jan 8, 2025 •

edited

Loading

mergify bot commented Jan 9, 2025 •

edited

Loading