Skip to content

runfix: Remove observables in user list #13848

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
merged 2 commits into from
Oct 27, 2022
Merged

runfix: Remove observables in user list #13848

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9e78af4
runfix: Remove observables in user list
thisisamir98 Oct 12, 2022
403e3dc
Merge branch 'acc' of github.com:wireapp/wire-webapp into fix-user-se…
thisisamir98 Oct 27, 2022
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
40 changes: 14 additions & 26 deletions src/script/components/UserSearchableList.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,13 +39,8 @@ import {UserState} from '../user/UserState';

export type UserListProps = React.ComponentProps<typeof UserList> & {
conversationState?: ConversationState;
// TODO: Remove this observables once all of the consumers of UserSearchableList are in migrated to react
observables?: {
filter?: ko.Observable<string>;
highlightedUsers?: ko.Observable<User[]>;
selected?: ko.ObservableArray<User>;
users: ko.ObservableArray<User>;
};
highlightedUsers?: User[];
users: User[];
filter?: string;
selected?: User[];
onUpdateSelectedUsers?: (updatedUsers: User[]) => void;
Expand All @@ -58,8 +53,16 @@ export type UserListProps = React.ComponentProps<typeof UserList> & {
dataUieName?: string;
};

const UserSearchableList: React.FC<UserListProps> = ({onUpdateSelectedUsers, dataUieName = '', ...props}) => {
const {searchRepository, teamRepository, observables, selfFirst, ...userListProps} = props;
const UserSearchableList: React.FC<UserListProps> = ({
onUpdateSelectedUsers,
dataUieName = '',
filter = '',
highlightedUsers,
selected: selectedUsers = [],
users,
...props
}) => {
const {searchRepository, teamRepository, selfFirst, ...userListProps} = props;
const {userState = container.resolve(UserState), conversationState = container.resolve(ConversationState)} = props;

const [filteredUsers, setFilteredUsers] = useState<User[]>([]);
Expand All @@ -68,19 +71,6 @@ const UserSearchableList: React.FC<UserListProps> = ({onUpdateSelectedUsers, dat
const {self: selfUser} = useKoSubscribableChildren(userState, ['self']);
const {inTeam: selfInTeam} = useKoSubscribableChildren(selfUser, ['inTeam']);

const {
users: unwrappedUsers,
selected: unwrappedSelected,
filter: unwrappedFilter = '',
highlightedUsers: unwrappedHighlightedUsers,
} = useKoSubscribableChildren(observables, ['users', 'selected', 'filter', 'highlightedUsers']);

// Note: We have to do this to handle both react & knockout props
const filter = props.filter || unwrappedFilter;
const highlightedUsers = props.highlightedUsers || unwrappedHighlightedUsers;
const selectedUsers = props.selected || unwrappedSelected;
const users = props.users || unwrappedUsers;

/**
* Try to load additional members from the backend.
* This is needed for large teams (>= 2000 members)
Expand Down Expand Up @@ -151,12 +141,10 @@ const UserSearchableList: React.FC<UserListProps> = ({onUpdateSelectedUsers, dat
};

const toggleUserSelection = (user: User) => {
if (selectedUsers?.find(selectedUser => selectedUser.id === user.id)) {
observables?.selected?.remove(user);
if (selectedUsers.find(selectedUser => selectedUser.id === user.id)) {
onUpdateSelectedUsers?.([...selectedUsers].filter(selectedUser => selectedUser.id !== user.id));
} else {
onUpdateSelectedUsers?.(selectedUsers ? [...selectedUsers, user] : [user]);
observables?.selected?.push(user);
onUpdateSelectedUsers?.([...selectedUsers, user]);
}
};

Expand Down