Skip to content

Commit

Permalink
Rework Asset Pack add to a list of filtered assets
Browse files Browse the repository at this point in the history 
Do not show in changelog
  • Loading branch information
@ClementPasteau
ClementPasteau authored Jun 8, 2022
1 parent b157210 commit 70226f4
Show file tree
Hide file tree
Showing 2 changed files with 36 additions and 45 deletions.
57 changes: 28 additions & 29 deletions newIDE/app/src/AssetStore/AssetPackDialog.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ type Props = {|
assetShortHeaders: Array<AssetShortHeader>,
addedAssetIds: Array<string>,
onClose: () => void,
onAssetPackAdded: () => void,
onAssetsAdded: () => void,
project: gdProject,
objectsContainer: gdObjectsContainer,
events: gdEventsList,
Expand All @@ -40,7 +40,7 @@ export const AssetPackDialog = ({
assetShortHeaders,
addedAssetIds,
onClose,
onAssetPackAdded,
onAssetsAdded,
project,
objectsContainer,
events,
Expand All @@ -56,18 +56,18 @@ export const AssetPackDialog = ({

const resourcesFetcher = useResourceFetcher();
const [
isAssetPackBeingInstalled,
setIsAssetPackBeingInstalled,
areAssetsBeingInstalled,
setAreAssetsBeingInstalled,
] = React.useState<boolean>(false);

const eventsFunctionsExtensionsState = React.useContext(
EventsFunctionsExtensionsContext
);

const onInstallAssetPack = React.useCallback(
const onInstallAssets = React.useCallback(
async (assetShortHeaders: Array<AssetShortHeader>) => {
if (!assetShortHeaders || !assetShortHeaders.length) return;
setIsAssetPackBeingInstalled(true);
setAreAssetsBeingInstalled(true);
try {
const installOutputs = await Promise.all(
assetShortHeaders.map(assetShortHeader =>
Expand All @@ -88,14 +88,14 @@ export const AssetPackDialog = ({

await resourcesFetcher.ensureResourcesAreFetched(project);

setIsAssetPackBeingInstalled(false);
onAssetPackAdded();
setAreAssetsBeingInstalled(false);
onAssetsAdded();
} catch (error) {
setIsAssetPackBeingInstalled(false);
console.error('Error while installing the asset pack', error);
setAreAssetsBeingInstalled(false);
console.error('Error while installing the assets', error);
showErrorBox({
message:
'There was an error while installing the asset pack. Verify your internet connection or try again later.',
'There was an error while installing the assets. Verify your internet connection or try again later.',
rawError: error,
errorId: 'install-asset-pack-error',
});
Expand All @@ -108,11 +108,11 @@ export const AssetPackDialog = ({
objectsContainer,
events,
onObjectAddedFromAsset,
onAssetPackAdded,
onAssetsAdded,
]
);

const dialogContent = isAssetPackBeingInstalled
const dialogContent = areAssetsBeingInstalled
? {
actionButton: (
<TextButton
Expand Down Expand Up @@ -141,15 +141,15 @@ export const AssetPackDialog = ({
key="install-again"
label={<Trans>Install again</Trans>}
primary={false}
onClick={() => onInstallAssetPack(assetShortHeaders)}
onClick={() => onInstallAssets(assetShortHeaders)}
/>
),
onApply: () => onInstallAssetPack(assetShortHeaders),
onApply: () => onInstallAssets(assetShortHeaders),
content: (
<Text>
<Trans>
You already have this asset pack installed, do you want to add the{' '}
{assetShortHeaders.length} assets again?
You already have these {assetShortHeaders.length} assets
installed, do you want to add them again?
</Trans>
</Text>
),
Expand All @@ -161,15 +161,14 @@ export const AssetPackDialog = ({
key="continue"
label={<Trans>Continue</Trans>}
primary
onClick={() => onInstallAssetPack(assetShortHeaders)}
onClick={() => onInstallAssets(assetShortHeaders)}
/>
),
onApply: () => onInstallAssetPack(assetShortHeaders),
onApply: () => onInstallAssets(assetShortHeaders),
content: (
<Text>
<Trans>
You're about to add {assetShortHeaders.length} assets from the
asset pack. Continue?
You're about to add {assetShortHeaders.length} assets. Continue?
</Trans>
</Text>
),
Expand All @@ -181,24 +180,24 @@ export const AssetPackDialog = ({
key="install-missing"
primary
onClick={() => {
onInstallAssetPack(missingAssetShortHeaders);
onInstallAssets(missingAssetShortHeaders);
}}
buildMenuTemplate={i18n => [
{
label: i18n._(t`Install all the assets`),
click: () => onInstallAssetPack(assetShortHeaders),
click: () => onInstallAssets(assetShortHeaders),
},
]}
/>
),
onApply: () => onInstallAssetPack(missingAssetShortHeaders),
onApply: () => onInstallAssets(missingAssetShortHeaders),
content: (
<Text>
<Trans>
You already have{' '}
{assetShortHeaders.length - missingAssetShortHeaders.length}{' '}
asset(s) from this pack in your scene. Do you want to add the
remaining {missingAssetShortHeaders.length} asset(s)?
asset(s) in your scene. Do you want to add the remaining{' '}
{missingAssetShortHeaders.length} one(s)?
</Trans>
</Text>
),
Expand All @@ -210,12 +209,12 @@ export const AssetPackDialog = ({
title={assetPack.name}
open
onRequestClose={() => {
if (!isAssetPackBeingInstalled) onClose();
if (!areAssetsBeingInstalled) onClose();
}}
cannotBeDismissed
actions={[
// Installing a pack is not cancelable, so we hide the button while installing.
!isAssetPackBeingInstalled ? (
// Installing a list of assets is not cancelable, so we hide the button while installing.
!areAssetsBeingInstalled ? (
<TextButton
key="cancel"
label={<Trans>Cancel</Trans>}
Expand Down
24 changes: 8 additions & 16 deletions newIDE/app/src/AssetStore/index.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,6 @@ export const AssetStore = ({
isAssetPackDialogInstallOpen,
setIsAssetPackDialogInstallOpen,
] = React.useState(false);
const [isAssetPackAdded, setIsAssetPackAdded] = React.useState(false);
const [
isAssetBeingInstalled,
setIsAssetBeingInstalled,
Expand Down Expand Up @@ -235,7 +234,6 @@ export const AssetStore = ({
navigationState.openHome();
clearAllFilters(assetFiltersState);
setIsFiltersPanelOpen(false);
setIsAssetPackAdded(false);
}}
size="small"
>
Expand Down Expand Up @@ -280,7 +278,6 @@ export const AssetStore = ({
if (navigationState.getCurrentPage().isOnHomePage) {
clearAllFilters(assetFiltersState);
setIsFiltersPanelOpen(false);
setIsAssetPackAdded(false);
}
}}
/>
Expand Down Expand Up @@ -308,17 +305,13 @@ export const AssetStore = ({
<Column expand alignItems="flex-end" noMargin>
<RaisedButton
primary
label={
isAssetPackAdded ? (
<Trans>Asset pack added</Trans>
) : (
<Trans>Add pack to my scene</Trans>
)
}
label={<Trans>Add all assets to my scene</Trans>}
onClick={() =>
setIsAssetPackDialogInstallOpen(true)
}
disabled={isAssetPackAdded}
disabled={
!searchResults || searchResults.length === 0
}
/>
</Column>
</>
Expand Down Expand Up @@ -377,9 +370,9 @@ export const AssetStore = ({
>
<AssetStoreFilterPanel
assetFiltersState={assetFiltersState}
onChoiceChange={() =>
navigationState.openSearchIfNeeded()
}
onChoiceChange={() => {
navigationState.openSearchIfNeeded();
}}
/>
</Line>
</ScrollView>
Expand Down Expand Up @@ -439,8 +432,7 @@ export const AssetStore = ({
assetShortHeaders={searchResults}
addedAssetIds={addedAssetIds}
onClose={() => setIsAssetPackDialogInstallOpen(false)}
onAssetPackAdded={() => {
setIsAssetPackAdded(true);
onAssetsAdded={() => {
setIsAssetPackDialogInstallOpen(false);
}}
project={project}
Expand Down

0 comments on commit 70226f4

Please sign in to comment.