Skip to content

fix(admin-ui): data not preloading on the Asset edit page (#2913) #2914

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
duttarnab merged 1 commit into from
Jul 1, 2026
Merged

fix(admin-ui): data not preloading on the Asset edit page (#2913) #2914

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
14 changes: 11 additions & 3 deletions admin-ui/app/routes/Apps/Gluu/GluuSelectRow.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,12 +72,20 @@ const GluuSelectRow: React.FC<GluuSelectRowProps> = ({
)

const displayValue = value != null ? String(value) : ''
const resolvedValues = useMemo(() => {
if (!displayValue) return values
const hasValue = values.some(
(item) => (typeof item === 'string' ? item : item.value) === displayValue,
)
return hasValue ? values : [displayValue, ...values]
}, [values, displayValue])

const options = useMemo(
() =>
deduplicateSelectValues(values).map((item) =>
deduplicateSelectValues(resolvedValues).map((item) =>
typeof item === 'string' ? item : (item.label ?? item.value),
),
[values],
[resolvedValues],
)

const content = freeSolo ? (
Expand Down Expand Up @@ -147,7 +155,7 @@ const GluuSelectRow: React.FC<GluuSelectRowProps> = ({
className={classes.select}
>
{!hideChooseOption && <option value="">{t('actions.choose')}...</option>}
{deduplicateSelectValues(values).map((item) => {
{deduplicateSelectValues(resolvedValues).map((item) => {
const optionValue = typeof item === 'string' ? item : item.value
const optionLabel = typeof item === 'string' ? item : (item.label ?? item.value)
return (
Expand Down
7 changes: 5 additions & 2 deletions admin-ui/plugins/admin/components/Assets/AssetForm.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,10 +36,13 @@ import { T_KEYS } from './constants'

const AssetForm: React.FC = () => {
const { id } = useParams<RouteParams>()
const { data: assetPage, isLoading: isLoadingAsset } = useGetAssetByInum(id ?? '', {
const { data: assetResponse, isLoading: isLoadingAsset } = useGetAssetByInum(id ?? '', {
query: { enabled: !!id },
})
const asset = assetPage?.entries?.[0] as Document | undefined
const asset = useMemo(() => {
const entry = assetResponse?.entries?.[0]
return (entry ?? assetResponse) as Document | undefined
}, [assetResponse])
const { data: servicesData } = useAssetServices()
const services = servicesData ?? []
const { t, i18n } = useTranslation()
Expand Down
Loading