SQuiz/frontPanel
3
0
Fork 0
Code Issues 18 Pull Requests 2 Actions Packages Projects Releases Wiki Activity

Merge branch 'dev' into 'staging'

Browse Source 
amo fix id

See merge request frontend/squiz!335
This commit is contained in:
Nastya 2024-06-01 22:43:19 +00:00
commit 2659496d49
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/components/CustomRadioGroup/CustomRadioGroup.tsx
View File

@ -214,7 +214,7 @@ export const CustomRadioGroup: FC<CustomRadioGroupProps> = ({
textOverflow: "ellipsis" textOverflow: "ellipsis"
} }
}} }}
value={pipeline.ID} value={pipeline.AmoID}
control={ control={
<Radio <Radio
checkedIcon={ checkedIcon={

3
src/components/CustomSelect/CustomSelect.tsx
View File

@ -20,6 +20,7 @@ type CustomSelectProps = {
type?: string; type?: string;
}; };
export const CustomSelect: FC<CustomSelectProps> = ({ export const CustomSelect: FC<CustomSelectProps> = ({
selectedItem, selectedItem,
setSelectedItem, setSelectedItem,
@ -89,6 +90,8 @@ export const CustomSelect: FC<CustomSelectProps> = ({
const menuItems = useMemo(() => { const menuItems = useMemo(() => {
if (type === "typeUsers" && users && users.length !== 0) { if (type === "typeUsers" && users && users.length !== 0) {
console.log(type)
console.log(users)
return users.map((user) => ( return users.map((user) => (
<MenuItem <MenuItem
key={user.ID} key={user.ID}