imprv: The delete button on the user home page is now hidden for unauthorized users. #9915

taikou-m · 2025-05-02T10:29:36Z

修正内容

削除メニューアイテムが表示されないようにした。

task

https://redmine.weseek.co.jp/issues/165282

changeset-bot · 2025-05-02T10:29:40Z

⚠️ No Changeset found

Latest commit: e46034f

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

apps/app/src/client/components/Common/Dropdown/PageItemControl.tsx

This reverts commit 29ecf94, reversing changes made to 054ae1e.

This reverts commit a5f6584.

packages/slack/src/utils/respond-util-factory.ts

This reverts commit 29ecf94, reversing changes made to 054ae1e.

This reverts commit af4c526.

mergify · 2025-05-21T19:42:05Z

This pull request has been removed from the queue for the following reason: checks failed.

The merge conditions cannot be satisfied due to failing checks:

❌ test-prod-node20 / run-playwright (chromium, 2/2)
❌ test-prod-node20 / run-playwright (firefox, 2/2)
❌ test-prod-node20 / run-playwright (webkit, 2/2)
☑️ approve-updating-patch-version
☑️ auto-labeling
☑️ check-title
☑️ test-prod-node18 / report-playwright
☑️ test-prod-node18 / run-playwright

You can check the last failing draft PR here: #9958.

You may have to fix your CI before adding the pull request to the queue again.
If you update this pull request, to fix the CI, it will automatically be requeued once the queue conditions match again.
If you think this was a flaky issue instead, you can requeue the pull request, without updating it, by posting a @mergifyio requeue comment.

miya

.

mergify · 2025-05-30T11:08:49Z

This pull request has been removed from the queue for the following reason: pull request dequeued.

Pull request #9915 has been dequeued. The pull request rule doesn't match anymore. The following conditions don't match anymore:

#changes-requested-reviews-by = 0.

You can check the last failing draft PR here: #9995.

You should look at the reason for the failure and decide if the pull request needs to be fixed or if you want to requeue it.
If you do update this pull request, it will automatically be requeued once the queue conditions match again.
If you think this was a flaky issue instead, you can requeue the pull request, without updating it, by posting a @mergifyio requeue comment.

yuki-takei · 2025-05-30T13:15:01Z

apps/app/src/client/components/PageControls/PageControls.tsx

+    }
+
+    return true;
+  }, [isGuestUser, isUsersHomepage, isUsersHomepageDeletionEnabled]);


currentPagePath が取得できていない (null) 場合を考慮してください

以下 AI の説明

currentPagePath が取得できていない場合（＝値が undefined や null の場合）、このコードでは以下のように記述されています：

const isUsersHomepage = pagePathUtils.isUsersHomepage(currentPagePath ?? '');

ここで currentPagePath ?? '' となっているため、currentPagePath が「null または undefined の場合」は空文字列 '' が pagePathUtils.isUsersHomepage に渡されます。

どうなるか？

pagePathUtils.isUsersHomepage('') の返り値がどうなるか次第です。

一般的に「ユーザーのホームページかどうか」を判定する関数なら、空文字列は「ユーザーのホームページではない」と判定され、false を返す設計が多いです。

結果として

currentPagePath が取得できていない場合、isUsersHomepage はたいてい false になる。

isEnableActions の値は

ゲストユーザーなら false

それ以外は true（isUsersHomepage が false なので2番目の if に入らないため）

要約
currentPagePath が取得できていない場合は「ユーザーのホームページではない」とみなされ、isEnableActions の判定にも特に悪影響はありません（通常どおりの権限判定になります）。

currentPagePath はなにか、を本質的に考えないといけない

currentPagePath が取得できないということは、システムグローバルに「今何のページを表示しているのか」を特定できていないということだ。
現状のコードでは、今何のページを表示しているのかを特定できないにも関わらず、isEnableActions は true となり、PageItemControl の各種ドロップダウンアイテムを表示して良い、という挙動になる。
つまり、「何のページかわからんけど削除メニュー表示しとくね」という挙動が有り得ることになる。

修正案

currentPagePath が取得できていない場合は isEnableActions を false にする

yuki-takei · 2025-06-03T21:59:09Z

apps/app/src/client/components/PageControls/PageControls.tsx

+    }
+
+    return true;
+  }, [isGuestUser, isUsersHomepage, isUsersHomepageDeletionEnabled]);


currentPagePath はなにか、を本質的に考えないといけない

currentPagePath が取得できないということは、システムグローバルに「今何のページを表示しているのか」を特定できていないということだ。
現状のコードでは、今何のページを表示しているのかを特定できないにも関わらず、isEnableActions は true となり、PageItemControl の各種ドロップダウンアイテムを表示して良い、という挙動になる。
つまり、「何のページかわからんけど削除メニュー表示しとくね」という挙動が有り得ることになる。

修正案

currentPagePath が取得できていない場合は isEnableActions を false にする

yuki-takei · 2025-06-04T13:02:06Z

@mergify queue

mergify · 2025-06-04T13:02:13Z

queue

🛑 The pull request has been removed from the queue `default`

Details

The merge conditions cannot be satisfied due to failing checks.

You can take a look at Queue: Embarked in merge queue check runs for more details about the failure.

mergify · 2025-06-04T13:09:54Z

This pull request has been removed from the queue for the following reason: checks failed.

The merge conditions cannot be satisfied due to failing checks:

You can check the last failing draft PR here: #10016.

You may have to fix your CI before adding the pull request to the queue again.
If you update this pull request, to fix the CI, it will automatically be requeued once the queue conditions match again.
If you think this was a flaky issue instead, you can requeue the pull request, without updating it, by posting a @mergifyio requeue comment.

yuki-takei · 2025-06-04T13:18:21Z

@mergify requeue

mergify · 2025-06-04T13:18:30Z

requeue

✅ The queue state of this pull request has been cleaned. It can be re-embarked automatically

yuki-takei · 2025-06-04T14:04:14Z

@mergify queue

mergify · 2025-06-04T14:04:23Z

queue

✅ The pull request has been merged automatically

Details

The pull request has been merged automatically at 2d4369b

fix user homepage delete button

e83f44c

github-actions bot added the type/bug label May 2, 2025

miya requested changes May 3, 2025

View reviewed changes

apps/app/src/client/components/Common/Dropdown/PageItemControl.tsx Show resolved Hide resolved

miya requested a review from yuki-takei May 3, 2025 08:31

miya assigned miya and unassigned miya May 3, 2025

taikou-m changed the title ~~fix user homepage delete button~~ feat: fix user homepage delete button May 9, 2025

Add condition

68d5ee7

yuki-takei requested changes May 14, 2025

View reviewed changes

apps/app/src/client/components/Common/Dropdown/PageItemControl.tsx Outdated Show resolved Hide resolved

fix:20250516 18:41

6f36ab2

miya requested changes May 16, 2025

View reviewed changes

apps/app/src/client/components/Common/Dropdown/PageItemControl.tsx Outdated Show resolved Hide resolved

apps/app/src/client/components/Common/Dropdown/PageItemControl.tsx Outdated Show resolved Hide resolved

fix:20250516 18:53

054ae1e

miya requested review from miya and yuki-takei May 19, 2025 01:45

miya approved these changes May 19, 2025

View reviewed changes

taikou-m changed the title ~~feat: fix user homepage delete button~~ imprv: Hide user delete button May 20, 2025

taikou-m and others added 3 commits May 20, 2025 19:46

Merge branch 'master' into fix/165282

29ecf94

Revert "Merge branch 'master' into fix/165282"

a5f6584

This reverts commit 29ecf94, reversing changes made to 054ae1e.

Reapply "Merge branch 'master' into fix/165282"

7c63684

This reverts commit a5f6584.

github-advanced-security bot found potential problems May 20, 2025

View reviewed changes

packages/slack/src/utils/respond-util-factory.ts Fixed Show fixed Hide fixed

miya and others added 3 commits May 20, 2025 11:12

Revert "Merge branch 'master' into fix/165282"

af4c526

This reverts commit 29ecf94, reversing changes made to 054ae1e.

Reapply "Merge branch 'master' into fix/165282"

3fe7cf7

This reverts commit af4c526.

202505202025

37aff31

taikou-m changed the title ~~imprv: Hide user delete button~~ imprv: The delete button on the user home page is now hidden for unauthorized users. May 20, 2025

yuki-takei approved these changes May 21, 2025

View reviewed changes

mergify bot added a commit that referenced this pull request May 21, 2025

Merge of #9915

e7f7459

mergify bot mentioned this pull request May 21, 2025

merge queue: embarking master (70fcf72) and #9915 together #9958

Closed

15 tasks

20250527 19:45

8fad48e

mergify bot added a commit that referenced this pull request May 30, 2025

Merge of #9915

e85c161

mergify bot mentioned this pull request May 30, 2025

merge queue: embarking master (fa28964) and #9915 together #9995

Closed

15 tasks

miya requested changes May 30, 2025

View reviewed changes

taikou-m added 2 commits May 30, 2025 11:39

20250530 20:39

79db193

20250530 21:03

40a9d05

yuki-takei requested changes May 30, 2025

View reviewed changes

yuki-takei self-requested a review May 30, 2025 13:15

taikou-m added 2 commits June 3, 2025 10:22

fix currentPagePath returning blank when null

69352d7

fix currentPagePath return blank when null 2

ad5da13

yuki-takei requested changes Jun 3, 2025

View reviewed changes

if currentPagePath is null return false 20250604 1

e46034f

yuki-takei approved these changes Jun 4, 2025

View reviewed changes

mergify bot added a commit that referenced this pull request Jun 4, 2025

Merge of #9915

9a63ae3

mergify bot mentioned this pull request Jun 4, 2025

merge queue: embarking master (c766212) and #9915 together #10016

Closed

15 tasks

mergify bot added a commit that referenced this pull request Jun 4, 2025

Merge of #9915

249506e

mergify bot mentioned this pull request Jun 4, 2025

merge queue: embarking master (c766212), #9915 and #9992 together #10017

Closed

15 tasks

mergify bot added a commit that referenced this pull request Jun 4, 2025

Merge of #9915

056bda3

mergify bot mentioned this pull request Jun 4, 2025

merge queue: embarking master (5c92dc1) and #9915 together #10022

Closed

15 tasks

mergify bot added a commit that referenced this pull request Jun 4, 2025

Merge of #9915

51399ea

mergify bot merged commit 2d4369b into master Jun 4, 2025
21 of 22 checks passed

mergify bot deleted the fix/165282 branch June 4, 2025 14:16

github-actions bot mentioned this pull request Jun 4, 2025

Release v7.2.6 #9988

Merged

imprv: The delete button on the user home page is now hidden for unauthorized users. #9915

imprv: The delete button on the user home page is now hidden for unauthorized users. #9915

Uh oh!

Conversation

taikou-m commented May 2, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

changeset-bot bot commented May 2, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

⚠️ No Changeset found

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

mergify bot commented May 21, 2025

Uh oh!

miya left a comment

Choose a reason for hiding this comment

Uh oh!

mergify bot commented May 30, 2025

Uh oh!

yuki-takei May 30, 2025

Choose a reason for hiding this comment

どうなるか？

結果として

Uh oh!

yuki-takei Jun 3, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

修正案

Uh oh!

yuki-takei Jun 3, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

修正案

Uh oh!

yuki-takei commented Jun 4, 2025

Uh oh!

mergify bot commented Jun 4, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

🛑 The pull request has been removed from the queue default

Uh oh!

mergify bot commented Jun 4, 2025

Uh oh!

yuki-takei commented Jun 4, 2025

Uh oh!

mergify bot commented Jun 4, 2025

✅ The queue state of this pull request has been cleaned. It can be re-embarked automatically

Uh oh!

yuki-takei commented Jun 4, 2025

Uh oh!

mergify bot commented Jun 4, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

✅ The pull request has been merged automatically

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

taikou-m commented May 2, 2025 •

edited

Loading

changeset-bot bot commented May 2, 2025 •

edited

Loading

yuki-takei Jun 3, 2025 •

edited

Loading

yuki-takei Jun 3, 2025 •

edited

Loading

mergify bot commented Jun 4, 2025 •

edited

Loading

🛑 The pull request has been removed from the queue `default`

mergify bot commented Jun 4, 2025 •

edited

Loading