Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Adds search bar in "Add Members" for groups #1800

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.

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
Show file tree
Hide file tree
Changes from all commits
Commits
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 client/packages/lowcoder/src/api/orgApi.ts
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,7 @@ export class OrgApi extends Api {
static updateOrgURL = (orgId: string) => `/organizations/${orgId}/update`;
static fetchUsage = (orgId: string) => `/organizations/${orgId}/api-usage`;
static fetchOrgsByEmailURL = (email: string) => `organizations/byuser/${email}`;
static fetchGroupPotentialMembersURL = (groupId: string) => `/groups/${groupId}/potential-members`;

static createGroup(request: { name: string }): AxiosPromise<GenericApiResponse<OrgGroup>> {
return Api.post(OrgApi.createGroupURL, request);
Expand Down Expand Up @@ -110,6 +111,10 @@ export class OrgApi extends Api {
return Api.get(OrgApi.fetchGroupUsersURL(groupId));
}

static fetchGroupPotentialMembers(searchName: string, groupId: string): AxiosPromise<OrgUsersResponse> {
return Api.get(OrgApi.fetchGroupPotentialMembersURL(groupId), {searchName})
}

static fetchGroupUsersPagination(request: fetchGroupUserRequestType): AxiosPromise<GroupUsersPaginationResponse> {
const {groupId, ...res} = request;
return Api.get(OrgApi.fetchGroupUsersURL(groupId), {...res});
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -86,6 +86,7 @@ export const ReduxActionTypes = {
UPDATE_USER_ORG_ROLE: "UPDATE_USER_ORG_ROLE",
UPDATE_USER_GROUP_ROLE: "UPDATE_USER_GROUP_ROLE",
FETCH_ORG_ALL_USERS: "FETCH_ORG_ALL_USERS",
FETCH_GROUP_POTENTIAL_MEMBERS: "FETCH_ORG_ALL_GROUP_MEMBERS",
FETCH_ORG_ALL_USERS_SUCCESS: "FETCH_ORG_ALL_USERS_SUCCESS",
FETCH_GROUP_USERS: "FETCH_GROUP_USERS",
FETCH_GROUP_USERS_SUCCESS: "FETCH_GROUP_USERS_SUCCESS",
Expand Down
1 change: 1 addition & 0 deletions client/packages/lowcoder/src/i18n/locales/en.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3008,6 +3008,7 @@ export const en = {
"deleteModalTitle": "Delete This Group",
"deleteModalContent": "The Deleted Group Cannot Be Restored. Are You Sure to Delete the Group?",
"addMember": "Add Members",
"searchMember": "Search Members",
"nameColumn": "User Name",
"joinTimeColumn": "Joining Time",
"actionColumn": "Operation",
Expand Down
Original file line number Diff line number Diff line change
@@ -1,11 +1,14 @@
import Column from "antd/es/table/Column";
import OrgApi from "api/orgApi";
import { GroupUser, MEMBER_ROLE, OrgUser } from "constants/orgConstants";
import { CheckBox, CustomModal } from "lowcoder-design";
import { CSSProperties, ReactNode, useEffect, useRef, useState } from "react";
import { CheckBox, CustomModal, Search } from "lowcoder-design";
import { CSSProperties, ReactNode, useEffect, useRef, useState, useCallback } from "react";
import { connect, useDispatch } from "react-redux";
import { AppState } from "redux/reducers";
import { fetchGroupUsersAction, fetchOrgUsersAction } from "redux/reduxActions/orgActions";
import { fetchGroupUsersAction,
fetchOrgUsersAction,
fetchGroupPotentialMembersAction
} from "redux/reduxActions/orgActions";
import styled from "styled-components";
import { StyledTable, UserTableCellWrapper } from "./styledComponents";
import { formatTimestamp } from "util/dateTimeUtils";
Expand All @@ -14,6 +17,7 @@ import { isGroupAdmin } from "util/permissionUtils";
import { SuperUserIcon } from "lowcoder-design";
import { EmptyContent } from "pages/common/styledComponent";
import { trans } from "i18n";
import { debounce } from "lodash";

const TableWrapper = styled.div`
margin-right: -16px;
Expand All @@ -40,7 +44,25 @@ function AddGroupUserDialog(props: {
const addableUsers = orgUsers.filter((user) => !groupUserIdMap.has(user.userId));
const toAddUserIdRecord = useRef<Record<string, boolean>>({});
const [confirmLoading, setConfirmLoading] = useState(false);
const [searchValue, setSearchValue] = useState("")
const dispatch = useDispatch();

const debouncedFetchPotentialMembers = useCallback(
debounce((searchVal: string) => {
dispatch(fetchGroupPotentialMembersAction(searchVal, groupId));
}, 500),
[dispatch, groupId]
);

useEffect(() => {
if (searchValue.length > 2 || searchValue === "") {
debouncedFetchPotentialMembers(searchValue);
}
return () => {
debouncedFetchPotentialMembers.cancel();
};
}, [searchValue, debouncedFetchPotentialMembers]);

useEffect(() => {
if (dialogVisible) {
dispatch(fetchOrgUsersAction(orgId));
Expand Down Expand Up @@ -92,7 +114,18 @@ function AddGroupUserDialog(props: {
setDialogVisible(false);
}}
>
{!addableUsers || addableUsers.length === 0 ? (
<Search
placeholder={trans("memberSettings.searchMember")}
value={searchValue}
onChange={(e) => setSearchValue(e.target.value)}
style={{
width: "100%",
height: "32px",
paddingRight: "20px",
marginBottom: "10px"
}}
/>
{(!addableUsers || addableUsers.length === 0) ? (
<EmptyContent />
) : (
<TableWrapper>
Expand All @@ -106,7 +139,7 @@ function AddGroupUserDialog(props: {
scroll={{ y: 309 }}
>
<Column
width="170px"
width="200px"
title={trans("memberSettings.nameColumn")}
dataIndex="name"
key="name"
Expand Down
8 changes: 8 additions & 0 deletions client/packages/lowcoder/src/redux/reduxActions/orgActions.ts
Original file line number Diff line number Diff line change
Expand Up @@ -81,6 +81,14 @@ export const deleteGroupUserAction = (payload: RemoveGroupUserPayload) => ({
payload: payload,
});

export const fetchGroupPotentialMembersAction = (searchName: string, groupId: string) => ({
type: ReduxActionTypes.FETCH_GROUP_POTENTIAL_MEMBERS,
payload: {
searchName,
groupId
},
});

export type AddGroupUserPayload = {
role: string;
groupId: string;
Expand Down
22 changes: 21 additions & 1 deletion client/packages/lowcoder/src/redux/sagas/orgSagas.ts
Original file line number Diff line number Diff line change
Expand Up @@ -107,11 +107,30 @@ export function* updateUserGroupRoleSaga(action: ReduxAction<UpdateUserGroupRole
}
}

export function* fetchGroupPotentialMembersSaga(action: ReduxAction<{ searchName: string, groupId: string }>) {
try {
const response: AxiosResponse<OrgUsersResponse> = yield call(
OrgApi.fetchGroupPotentialMembers,
action.payload.searchName,
action.payload.groupId
);
const isValidResponse: boolean = validateResponse(response);
if (isValidResponse) {
yield put({
type: ReduxActionTypes.FETCH_ORG_ALL_USERS_SUCCESS,
payload: response.data.data,
});
}
} catch (error) {
log.error(error);
}
}

export function* fetchOrgUsersSaga(action: ReduxAction<{ orgId: string }>) {
try {
const response: AxiosResponse<OrgUsersResponse> = yield call(
OrgApi.fetchOrgUsers,
action.payload.orgId
action.payload.orgId,
);
const isValidResponse: boolean = validateResponse(response);
if (isValidResponse) {
Expand Down Expand Up @@ -377,6 +396,7 @@ export default function* orgSagas() {
takeLatest(ReduxActionTypes.UPDATE_USER_ORG_ROLE, updateUserOrgRoleSaga),
takeLatest(ReduxActionTypes.UPDATE_USER_GROUP_ROLE, updateUserGroupRoleSaga),
takeLatest(ReduxActionTypes.FETCH_ORG_ALL_USERS, fetchOrgUsersSaga),
takeLatest(ReduxActionTypes.FETCH_GROUP_POTENTIAL_MEMBERS, fetchGroupPotentialMembersSaga),
takeLatest(ReduxActionTypes.DELETE_ORG_USER, deleteOrgUserSaga),
takeLatest(ReduxActionTypes.QUIT_GROUP, quitGroupSaga),
takeLatest(ReduxActionTypes.QUIT_ORG, quitOrgSaga),
Expand Down
Loading