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

IOS-2492 Widget Object List | Support permissions in actions #1063

Merged
merged 1 commit into from
Mar 27, 2024
Merged

IOS-2492 Widget Object List | Support permissions in actions #1063

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
5 changes: 5 additions & 0 deletions Anytype/Sources/Models/ObjectPermissions/ObjectPermissions.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,6 +83,11 @@ struct ObjectPermissions: Equatable {
}

extension ObjectDetails {

func permissions(particioant: Participant?) -> ObjectPermissions {
permissions(participantCanEdit: particioant?.canEdit ?? false)
}

func permissions(participantCanEdit: Bool) -> ObjectPermissions {
ObjectPermissions(
details: self,
Expand Down
18 changes: 12 additions & 6 deletions ...rces/PresentationLayer/Modules/WidgetObjectList/Buildes/WidgetObjectListMenuBuilder.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,14 @@ protocol WidgetObjectListMenuBuilderProtocol: AnyObject {
func buildOptionsMenu(
details: [ObjectDetails],
allowOptions: [WidgetObjectListMenuItem],
participant: Participant?,
output: WidgetObjectListMenuOutput
) -> [SelectionOptionsItemViewModel]

func buildMenuItems(
details: ObjectDetails,
allowOptions: [WidgetObjectListMenuItem],
participant: Participant?,
output: WidgetObjectListMenuOutput
) -> [WidgetObjectListMenuItemModel]
}
Expand All @@ -30,10 +32,11 @@ final class WidgetObjectListMenuBuilder: WidgetObjectListMenuBuilderProtocol {
func buildOptionsMenu(
details: [ObjectDetails],
allowOptions: [WidgetObjectListMenuItem],
participant: Participant?,
output: WidgetObjectListMenuOutput
) -> [SelectionOptionsItemViewModel] {

let actions = build(details: details, allowOptions: allowOptions, output: output)
let actions = build(details: details, allowOptions: allowOptions, participant: participant, output: output)

return actions.map { action in
SelectionOptionsItemViewModel(id: UUID().uuidString, title: action.optionTitle, imageAsset: action.optionImage, action: action.action)
Expand All @@ -43,10 +46,11 @@ final class WidgetObjectListMenuBuilder: WidgetObjectListMenuBuilderProtocol {
func buildMenuItems(
details: ObjectDetails,
allowOptions: [WidgetObjectListMenuItem],
participant: Participant?,
output: WidgetObjectListMenuOutput
) -> [WidgetObjectListMenuItemModel] {

let actions = build(details: [details], allowOptions: allowOptions, output: output)
let actions = build(details: [details], allowOptions: allowOptions, participant: participant, output: output)

return actions.map { action in
WidgetObjectListMenuItemModel(id: UUID().uuidString, title: action.menuTitle, negative: action.negative, onTap: action.action)
Expand All @@ -58,14 +62,16 @@ final class WidgetObjectListMenuBuilder: WidgetObjectListMenuBuilderProtocol {
private func build(
details: [ObjectDetails],
allowOptions: [WidgetObjectListMenuItem],
participant: Participant?,
output: WidgetObjectListMenuOutput
) -> [Action] {

let permissions = details.map { $0.permissions(particioant: participant) }

let isFavoriteIds = details.filter { $0.isFavorite }.map(\.id)
let isUndavoriteIds = details.filter { !$0.isFavorite }.map(\.id)
let notArchivedIds = details.filter { !$0.isArchived }.map(\.id)
let isArchivedIds = details.filter { $0.isArchived }.map(\.id)
let isFavoriteIds = details.enumerated().filter { $1.isFavorite && permissions[$0].canFavorite }.map { $1.id }
let isUndavoriteIds = details.enumerated().filter { !$1.isFavorite && permissions[$0].canFavorite }.map { $1.id }
let notArchivedIds = details.enumerated().filter { !$1.isArchived && permissions[$0].canArchive }.map { $1.id }
let isArchivedIds = details.enumerated().filter { $1.isArchived && permissions[$0].canArchive }.map { $1.id }
let allIds = details.map(\.id)

return .builder {
Expand Down
10 changes: 7 additions & 3 deletions Anytype/Sources/PresentationLayer/Modules/WidgetObjectList/WidgetObjectListViewModel.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@ final class WidgetObjectListViewModel: ObservableObject, OptionsItemProvider, Wi
private var rowDetails: [WidgetObjectListDetailsData] = []
private var searchText: String?
private var subscriptions = [AnyCancellable]()
private var participant: Participant?
private var selectedRowIds: Set<String> = [] {
didSet { updateView() }
}
Expand Down Expand Up @@ -86,10 +87,12 @@ final class WidgetObjectListViewModel: ObservableObject, OptionsItemProvider, Wi
}

func startParticipantTask() async {
for await newCanEdit in accountParticipantStorage.canEditPublisher(spaceId: activeWorkspaceStorage.workspaceInfo.accountSpaceId).values {
canEdit = newCanEdit
for await participant in accountParticipantStorage.participantPublisher(spaceId: activeWorkspaceStorage.workspaceInfo.accountSpaceId).values {
self.participant = participant
canEdit = participant.canEdit
editMode = canEdit ? internalModel.editMode : .normal(allowDnd: false)
viewEditMode = (editMode == .editOnly) ? .active : .inactive
updateView()
}
}

Expand Down Expand Up @@ -193,6 +196,7 @@ final class WidgetObjectListViewModel: ObservableObject, OptionsItemProvider, Wi
menu: menuBuilder.buildMenuItems(
details: details,
allowOptions: internalModel.availableMenuItems,
participant: participant,
output: self
),
onTap: { [weak self] in
Expand Down Expand Up @@ -233,7 +237,7 @@ final class WidgetObjectListViewModel: ObservableObject, OptionsItemProvider, Wi

private func updateActions() {
let selectedDetails = rowDetails.flatMap { $0.details }.filter { selectedRowIds.contains($0.id) }
options = menuBuilder.buildOptionsMenu(details: selectedDetails, allowOptions: internalModel.availableMenuItems, output: self)
options = menuBuilder.buildOptionsMenu(details: selectedDetails, allowOptions: internalModel.availableMenuItems, participant: participant, output: self)
}

private func validateSelectedIds() {
Expand Down
Loading