Skip to content
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

Unify Build & Manage tabs #7217

Open
wants to merge 15 commits into
base: master
Choose a base branch
from
Open

Unify Build & Manage tabs #7217

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
308f8a4
Wip dashboard refreshes
ClementPasteau Dec 2, 2024
b5d753f
wip handle register/unregister/save from dashboard
ClementPasteau Dec 3, 2024
398e96d
Fix refreshing games and disable buttons
ClementPasteau Dec 4, 2024
4a0c262
Hide refresh when no games
ClementPasteau Dec 4, 2024
14a754d
Fix stories
ClementPasteau Dec 4, 2024
8e49ce1
More responsive improvements
ClementPasteau Dec 4, 2024
5ae5b66
Fix more buttons
ClementPasteau Dec 4, 2024
dd64d2e
Fix saved status & buttons
ClementPasteau Dec 5, 2024
41ce844
Save page & improve buttons
ClementPasteau Dec 5, 2024
c533358
get started improvements
ClementPasteau Dec 9, 2024
ed327ba
Improvements everywhere
ClementPasteau Dec 10, 2024
dadab09
Some fixes
ClementPasteau Dec 10, 2024
d13d000
Small design fixes
ClementPasteau Dec 11, 2024
d34856d
Improvements & fixes
ClementPasteau Dec 11, 2024
3a6bad5
Fix search
ClementPasteau Dec 11, 2024
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
78 changes: 55 additions & 23 deletions newIDE/app/src/AssetStore/ExampleStore/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ import GridList from '@material-ui/core/GridList';
import { getExampleAndTemplateTiles } from '../../MainFrame/EditorContainers/HomePage/CreateSection/utils';
import BackgroundText from '../../UI/BackgroundText';
import { ColumnStackLayout } from '../../UI/Layout';
import { isStartingPointExampleShortHeader } from '../../ProjectCreation/EmptyAndStartingPointProjects';

const styles = {
grid: {
Expand All @@ -39,27 +40,43 @@ const gameFilter = (
return true;
};

const noStartingPointFilter = (
item: PrivateGameTemplateListingData | ExampleShortHeader
) => {
if (item.previewImageUrls) {
// It's an example, filter out the starting points.
return !isStartingPointExampleShortHeader(item);
}

// It's a game template, always show.
return true;
};

type Props = {|
onSelectExampleShortHeader: ExampleShortHeader => void,
onSelectPrivateGameTemplateListingData: PrivateGameTemplateListingData => void,
i18n: I18nType,
onlyShowGames?: boolean,
hideStartingPoints?: boolean,
columnsCount: number,
rowToInsert?: {|
row: number,
element: React.Node,
|},
hideSearch?: boolean,
|};

const ExampleStore = ({
onSelectExampleShortHeader,
onSelectPrivateGameTemplateListingData,
i18n,
onlyShowGames,
hideStartingPoints,
columnsCount,
rowToInsert,
hideSearch,
}: Props) => {
const { receivedGameTemplates } = React.useContext(AuthenticatedUserContext);
const authenticatedUser = React.useContext(AuthenticatedUserContext);
const {
exampleShortHeadersSearchResults,
fetchExamplesAndFilters,
Expand Down Expand Up @@ -123,14 +140,19 @@ const ExampleStore = ({
const resultTiles: React.Node[] = React.useMemo(
() => {
return getExampleAndTemplateTiles({
receivedGameTemplates,
receivedGameTemplates: authenticatedUser.receivedGameTemplates,
privateGameTemplateListingDatas: privateGameTemplateListingDatasSearchResults
? privateGameTemplateListingDatasSearchResults
.map(({ item }) => item)
.filter(
privateGameTemplateListingData =>
!onlyShowGames || gameFilter(privateGameTemplateListingData)
)
.filter(
privateGameTemplateListingData =>
!hideStartingPoints ||
noStartingPointFilter(privateGameTemplateListingData)
)
: [],
exampleShortHeaders: exampleShortHeadersSearchResults
? exampleShortHeadersSearchResults
Expand All @@ -139,6 +161,11 @@ const ExampleStore = ({
exampleShortHeader =>
!onlyShowGames || gameFilter(exampleShortHeader)
)
.filter(
exampleShortHeader =>
!hideStartingPoints ||
noStartingPointFilter(exampleShortHeader)
)
: [],
onSelectPrivateGameTemplateListingData: privateGameTemplateListingData => {
sendGameTemplateInformationOpened({
Expand All @@ -160,13 +187,14 @@ const ExampleStore = ({
}).allGridItems;
},
[
receivedGameTemplates,
authenticatedUser,
privateGameTemplateListingDatasSearchResults,
exampleShortHeadersSearchResults,
onSelectPrivateGameTemplateListingData,
onSelectExampleShortHeader,
i18n,
onlyShowGames,
hideStartingPoints,
]
);

Expand All @@ -183,15 +211,17 @@ const ExampleStore = ({
numberOfTilesToDisplayUntilRowToInsert
);
return [
<GridList
cols={columnsCount}
style={styles.grid}
cellHeight="auto"
spacing={2}
key="first-tiles"
>
{firstTiles}
</GridList>,
firstTiles.length > 0 ? (
<GridList
cols={columnsCount}
style={styles.grid}
cellHeight="auto"
spacing={2}
key="first-tiles"
>
{firstTiles}
</GridList>
) : null,
rowToInsert ? (
<Line key="inserted-row">{rowToInsert.element}</Line>
) : null,
Expand All @@ -214,17 +244,19 @@ const ExampleStore = ({
return (
<React.Fragment>
<Column expand noMargin>
<Line>
<Column expand noMargin>
<SearchBar
value={localSearchText}
onChange={setSearchText}
onRequestSearch={() => {}}
ref={searchBarRef}
placeholder={t`Search examples`}
/>
</Column>
</Line>
{!hideSearch && (
<Line>
<Column expand noMargin>
<SearchBar
value={localSearchText}
onChange={setSearchText}
onRequestSearch={() => {}}
ref={searchBarRef}
placeholder={t`Search examples`}
/>
</Column>
</Line>
)}
{resultTiles.length === 0 ? (
<Column noMargin expand justifyContent="center">
<Spacer />
Expand Down
Loading
Loading