github-mirror/project-nomad
1
0
Fork 0
mirror of https://github.com/Crosstalk-Solutions/project-nomad.git synced 2026-04-08 17:56:17 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

feat(Maps): enhance missing assets warnings

Browse Source
This commit is contained in:
Jake Turner 2026-01-15 20:23:17 +00:00 committed by Jake Turner
parent 400cd740bd
commit b6ac6b1e84
5 changed files with 53 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
admin/app/controllers/maps_controller.ts
View File

@ -13,7 +13,14 @@ export default class MapsController {
constructor(private mapService: MapService) {} constructor(private mapService: MapService) {}
async index({ inertia }: HttpContext) { async index({ inertia }: HttpContext) {
return inertia.render('maps') const baseAssetsCheck = await this.mapService.checkBaseAssetsExist()
const regionFiles = await this.mapService.listRegions()
return inertia.render('maps', {
maps: {
baseAssetsExist: baseAssetsCheck,
regionFiles: regionFiles.files,
},
})
} }
async checkBaseAssets({}: HttpContext) { async checkBaseAssets({}: HttpContext) {

30
admin/inertia/components/layout/MissingBaseAssetsAlert.tsx
View File

@ -1,30 +0,0 @@
import AlertWithButton from "../AlertWithButton"
export type MissingBaseAssetsAlertProps = {
onClickDownload?: () => Promise<void>
loading?: boolean
}
const MissingBaseAssetsAlert = (props: MissingBaseAssetsAlertProps) => {
return (
<AlertWithButton
title="The base map assets have not been installed. Please download them first to enable map functionality."
type="warning"
variant="solid"
className="!mt-6"
buttonProps={{
variant: 'secondary',
children: 'Download Base Assets',
icon: 'ArrowDownTrayIcon',
loading: props.loading || false,
onClick: () => {
if (props.onClickDownload) {
return props.onClickDownload()
}
}
}}
/>
)
}
export default MissingBaseAssetsAlert

30
admin/inertia/pages/maps.tsx
View File

@ -3,8 +3,18 @@ import { Head, Link } from '@inertiajs/react'
import MapComponent from '~/components/maps/MapComponent' import MapComponent from '~/components/maps/MapComponent'
import StyledButton from '~/components/StyledButton' import StyledButton from '~/components/StyledButton'
import { IconArrowLeft } from '@tabler/icons-react' import { IconArrowLeft } from '@tabler/icons-react'
import { FileEntry } from '../../types/files'
import AlertWithButton from '~/components/AlertWithButton'
export default function Maps(props: {
maps: { baseAssetsExist: boolean; regionFiles: FileEntry[] }
}) {
const alertMessage = !props.maps.baseAssetsExist
? 'The base map assets have not been installed. Please download them first to enable map functionality.'
: props.maps.regionFiles.length === 0
? 'No map regions have been downloaded yet. Please download some regions to enable map functionality.'
: null
export default function Maps() {
return ( return (
<MapsLayout> <MapsLayout>
<Head title="Maps" /> <Head title="Maps" />
@ -19,7 +29,23 @@ export default function Maps() {
</StyledButton> </StyledButton>
</Link> </Link>
</div> </div>
<div className="w-full h-full flex p-4 justify-center items-center"> <div className="w-full min-h-screen flex flex-col items-center justify-center py-4 mx-4">
{alertMessage && (
<AlertWithButton
title={alertMessage}
type="warning"
variant="solid"
className="w-full !mb-4"
buttonProps={{
variant: 'secondary',
children: 'Go to Map Settings',
icon: 'Cog6ToothIcon',
onClick: () => {
window.location.href = '/settings/maps'
},
}}
/>
)}
<MapComponent /> <MapComponent />
</div> </div>
</MapsLayout> </MapsLayout>

16
admin/inertia/pages/settings/maps.tsx
View File

@ -5,7 +5,6 @@ import StyledButton from '~/components/StyledButton'
import { useModals } from '~/context/ModalContext' import { useModals } from '~/context/ModalContext'
import StyledModal from '~/components/StyledModal' import StyledModal from '~/components/StyledModal'
import { FileEntry } from '../../../types/files' import { FileEntry } from '../../../types/files'
import MissingBaseAssetsAlert from '~/components/layout/MissingBaseAssetsAlert'
import { useNotifications } from '~/context/NotificationContext' import { useNotifications } from '~/context/NotificationContext'
import { useState } from 'react' import { useState } from 'react'
import api from '~/lib/api' import api from '~/lib/api'
@ -16,6 +15,7 @@ import StyledSectionHeader from '~/components/StyledSectionHeader'
import CuratedCollectionCard from '~/components/CuratedCollectionCard' import CuratedCollectionCard from '~/components/CuratedCollectionCard'
import { CuratedCollectionWithStatus } from '../../../types/downloads' import { CuratedCollectionWithStatus } from '../../../types/downloads'
import ActiveDownloads from '~/components/ActiveDownloads' import ActiveDownloads from '~/components/ActiveDownloads'
import AlertWithButton from '~/components/AlertWithButton'
const CURATED_COLLECTIONS_KEY = 'curated-map-collections' const CURATED_COLLECTIONS_KEY = 'curated-map-collections'
@ -194,7 +194,19 @@ export default function MapsManager(props: {
</div> </div>
</div> </div>
{!props.maps.baseAssetsExist && ( {!props.maps.baseAssetsExist && (
<MissingBaseAssetsAlert loading={downloading} onClickDownload={downloadBaseAssets} /> <AlertWithButton
title="The base map assets have not been installed. Please download them first to enable map functionality."
type="warning"
variant="solid"
className="my-4"
buttonProps={{
variant: 'secondary',
children: 'Download Base Assets',
icon: 'ArrowDownTrayIcon',
loading: downloading,
onClick: () => downloadBaseAssets(),
}}
/>
)} )}
<StyledSectionHeader title="Curated Map Collections" className="mt-8 !mb-4" /> <StyledSectionHeader title="Curated Map Collections" className="mt-8 !mb-4" />
<StyledButton <StyledButton

3
admin/inertia/pages/settings/zim/remote-explorer.tsx
View File

@ -66,6 +66,9 @@ export default function ZimRemoteExplorer() {
const pageParsed = parseInt((pageParam as number).toString(), 10) const pageParsed = parseInt((pageParam as number).toString(), 10)
const start = isNaN(pageParsed) ? 0 : pageParsed * 12 const start = isNaN(pageParsed) ? 0 : pageParsed * 12
const res = await api.listRemoteZimFiles({ start, count: 12, query: query || undefined }) const res = await api.listRemoteZimFiles({ start, count: 12, query: query || undefined })
if (!res) {
throw new Error('Failed to fetch remote ZIM files.')
}
return res.data return res.data
}, },
initialPageParam: 0, initialPageParam: 0,