Skip to content

Channel Actions - Only show Leave Group options if user has "leave-channel" permission #630

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

Merged
nuno-vieira merged 4 commits into from
Oct 31, 2024
Merged

Channel Actions - Only show Leave Group options if user has "leave-channel" permission #630

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
ea2d627
Channel Actions - Only show Leave Group if user has "leave-channel" p…
bpollman Oct 29, 2024
b4e2bb1
Channel Actions - Update tests for leave button
bpollman Oct 30, 2024
a613d3f
Update Package to point to PR branch with Mock update.
bpollman Oct 30, 2024
c18db1b
Merge branch 'develop' into leave-channel-permissions
nuno-vieira Oct 31, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 5 additions & 2 deletions Sources/StreamChatSwiftUI/ChatChannel/ChannelInfo/ChatChannelInfoViewModel.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,8 +37,11 @@ public class ChatChannelInfoViewModel: ObservableObject, ChatChannelControllerDe
@Published public var addUsersShown = false

public var shouldShowLeaveConversationButton: Bool {
channel.ownCapabilities.contains(.deleteChannel)
|| !channel.isDirectMessageChannel
if channel.isDirectMessageChannel {
return channel.ownCapabilities.contains(.deleteChannel)
} else {
return channel.ownCapabilities.contains(.leaveChannel)
}
}

public var canRenameChannel: Bool {
Expand Down
2 changes: 1 addition & 1 deletion Sources/StreamChatSwiftUI/ChatChannelList/DefaultChannelActions.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ extension ChannelAction {

actions.append(viewInfo)

if !channel.isDirectMessageChannel, let userId = chatClient.currentUserId {
if !channel.isDirectMessageChannel, channel.ownCapabilities.contains(.leaveChannel), let userId = chatClient.currentUserId {
let leaveGroup = leaveGroup(
for: channel,
chatClient: chatClient,
Expand Down
6 changes: 3 additions & 3 deletions StreamChatSwiftUI.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3818,10 +3818,10 @@
};
84E95A75284A486600699FD3 /* XCRemoteSwiftPackageReference "stream-chat-swift" */ = {
isa = XCRemoteSwiftPackageReference;
repositoryURL = "https://github.com/GetStream/stream-chat-swift.git";
repositoryURL = "https://github.com/bpollman/stream-chat-swift.git";
requirement = {
kind = upToNextMajorVersion;
minimumVersion = 4.65.0;
branch = "update-dm-mocks";
kind = branch;
};
};
E3A1C01A282BAC66002D1E26 /* XCRemoteSwiftPackageReference "sentry-cocoa" */ = {
Expand Down
16 changes: 14 additions & 2 deletions StreamChatSwiftUITests/Tests/ChatChannel/ChannelInfo/ChatChannelInfoViewModel_Tests.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -222,10 +222,21 @@ class ChatChannelInfoViewModel_Tests: StreamChatTestCase {
XCTAssert(leaveButton == true)
}

func test_chatChannelInfoVM_leaveButtonHiddenInGroup() {
// Given
let channel = mockGroup(with: 5, updateCapabilities: false)
let viewModel = ChatChannelInfoViewModel(channel: channel)

// When
let leaveButton = viewModel.shouldShowLeaveConversationButton

// Then
XCTAssert(leaveButton == false)
}

func test_chatChannelInfoVM_leaveButtonShownInDM() {
// Given
let channel = ChatChannel.mock(
cid: .unique,
let channel = ChatChannel.mockDMChannel(
name: "Test",
ownCapabilities: [.deleteChannel]
)
Expand Down Expand Up @@ -262,6 +273,7 @@ class ChatChannelInfoViewModel_Tests: StreamChatTestCase {
if updateCapabilities {
capabilities.insert(.updateChannel)
capabilities.insert(.deleteChannel)
capabilities.insert(.leaveChannel)
}
let channel = ChatChannel.mock(
cid: cid,
Expand Down
Loading