Skip to content

Commit

Permalink
BUGFIX: Make sure the useAssetsQuery is always registered and notify …
Browse files Browse the repository at this point in the history
…assets errors
  • Loading branch information
Sebobo committed Jul 16, 2024
1 parent bc69ea1 commit fe0df77
Showing 1 changed file with 12 additions and 1 deletion.
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,9 @@ import { useRecoilValue, useSetRecoilState } from 'recoil';

import { Button } from '@neos-project/react-ui-components';

import { useIntl } from '@media-ui/core';
import { useIntl, useNotify } from '@media-ui/core';
import { availableAssetIdentitiesState, searchTermState } from '@media-ui/core/src/state';
import useAssetsQuery from '@media-ui/core/src/hooks/useAssetsQuery';
import { clipboardState, clipboardVisibleState } from '@media-ui/feature-clipboard';
import { useUnusedAssetsQuery } from '@media-ui/feature-asset-usage';

Expand All @@ -17,11 +18,14 @@ import classes from './Main.module.css';
const Main: React.FC = () => {
const viewModeSelection = useRecoilValue(viewModeState);
const { assets: unusedAssets } = useUnusedAssetsQuery();
// The useAssetsQuery should always be registered here to ensure that the assets are loaded
const { error: assetsLoadingError } = useAssetsQuery();
const clipboard = useRecoilValue(clipboardState);
const mainView = useRecoilValue(mainViewState);
const setClipboardVisible = useSetRecoilState(clipboardVisibleState);
const searchTerm = useRecoilValue(searchTermState);
const { translate } = useIntl();
const Notify = useNotify();
const availableAssetIdentities = useRecoilValue(availableAssetIdentitiesState);
const [visibleAssetIdentities, setVisibleAssetIdentities] = useState<AssetIdentity[]>(availableAssetIdentities);

Expand All @@ -43,6 +47,13 @@ const Main: React.FC = () => {
}
}, [mainView, availableAssetIdentities, queriedUnusedAssets, clipboard]);

// Output loading errors to the console
useEffect(() => {
if (assetsLoadingError) {
Notify.error('Error loading assets', assetsLoadingError.message);
}
}, [Notify, assetsLoadingError]);

return visibleAssetIdentities.length > 0 ? (
viewModeSelection === VIEW_MODES.List ? (
<ListView assetIdentities={visibleAssetIdentities} />
Expand Down

0 comments on commit fe0df77

Please sign in to comment.