github/drone
5
0
Fork 0
mirror of https://github.com/harness/drone.git synced 2025-05-13 23:50:47 +08:00
Code Issues Packages Projects Releases Wiki Activity

[UI] Membership Add Is not filtering for Users (#317)

Browse Source
This commit is contained in:
Johannes Batzill 2023-08-15 03:41:23 +00:00 committed by Harness
parent c6fa9c0218
commit f8d1ca6460
3 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
web/src/components/CreateBranchModal/CreateBranchModal.tsx
View File

@ -22,7 +22,7 @@ import { get } from 'lodash-es'
import { useModalHook } from '@harness/use-modal' import { useModalHook } from '@harness/use-modal'
import { useStrings } from 'framework/strings' import { useStrings } from 'framework/strings'
import { getErrorMessage, permissionProps } from 'utils/Utils' import { getErrorMessage, permissionProps } from 'utils/Utils'
import { CodeIcon, GitInfoProps, isGitBranchNameValid } from 'utils/GitUtils' import { GitInfoProps, isGitBranchNameValid } from 'utils/GitUtils'
import { BranchTagSelect } from 'components/BranchTagSelect/BranchTagSelect' import { BranchTagSelect } from 'components/BranchTagSelect/BranchTagSelect'
import type { RepoBranch } from 'services/code' import type { RepoBranch } from 'services/code'
import { useGetSpaceParam } from 'hooks/useGetSpaceParam' import { useGetSpaceParam } from 'hooks/useGetSpaceParam'

8
web/src/pages/SpaceAccessControl/AddNewMember/AddNewMember.tsx
View File

@ -6,12 +6,12 @@ import { Formik } from 'formik'
import * as Yup from 'yup' import * as Yup from 'yup'
import { useStrings } from 'framework/strings' import { useStrings } from 'framework/strings'
import { useGet } from 'restful-react'
import { useGetSpaceParam } from 'hooks/useGetSpaceParam' import { useGetSpaceParam } from 'hooks/useGetSpaceParam'
import { import {
MembershipAddRequestBody, MembershipAddRequestBody,
TypesMembershipUser, TypesMembershipUser,
TypesPrincipalInfo, TypesPrincipalInfo,
useListPrincipals,
useMembershipAdd, useMembershipAdd,
useMembershipUpdate useMembershipUpdate
} from 'services/code' } from 'services/code'
@ -36,16 +36,18 @@ const useAddNewMember = ({ onClose }: { onClose: () => void }) => {
user_uid: membershipDetails?.principal?.uid || '' user_uid: membershipDetails?.principal?.uid || ''
}) })
const { data: users, loading: fetchingUsers } = useListPrincipals({ const { data: users, loading: fetchingUsers } = useGet<TypesPrincipalInfo[]>({
path: `/api/v1/principals`,
queryParams: { queryParams: {
query: searchTerm, query: searchTerm,
page: 1, page: 1,
limit: LIST_FETCHING_LIMIT, limit: LIST_FETCHING_LIMIT,
type: ['user'] type: 'user'
}, },
debounce: 500 debounce: 500
}) })
const roleOptions: SelectOption[] = useMemo( const roleOptions: SelectOption[] = useMemo(
() => () =>
roles.map(role => ({ roles.map(role => ({

2
web/src/utils/FileUtils.ts
View File

@ -1,4 +1,4 @@
import { useEffect, useMemo } from 'react' import { useMemo } from 'react'
import { pdfjs } from 'react-pdf' import { pdfjs } from 'react-pdf'
import { useAppContext } from 'AppContext' import { useAppContext } from 'AppContext'
import type { RepoFileContent } from 'services/code' import type { RepoFileContent } from 'services/code'