diff --git a/shared/components/cards/AuthLockCard.astro b/shared/components/cards/AuthLockCard.astro index 1877a6f1f..e2a136763 100644 --- a/shared/components/cards/AuthLockCard.astro +++ b/shared/components/cards/AuthLockCard.astro @@ -3,8 +3,9 @@ import Button from '@ui/Button.astro' import Avatar from '@ui/Avatar.astro' import CardTitle from '@ui/CardTitle.astro' import people from '@data/people.json' +import { requireIndex } from '@shared/lib/array' -const person = people[0] +const person = requireIndex(people, 0) ---
diff --git a/shared/components/cards/Card.astro b/shared/components/cards/Card.astro index e58b7ed64..6f504bcc3 100644 --- a/shared/components/cards/Card.astro +++ b/shared/components/cards/Card.astro @@ -5,6 +5,7 @@ import AvatarList from '@ui/AvatarList.astro'; import Empty from '@ui/Empty.astro'; import Progress from '@ui/Progress.astro'; import photos from '@data/photos.json'; +import { requireIndex } from '@shared/lib/array'; interface Props { link?: boolean; @@ -61,7 +62,7 @@ const { footerButtons, footerElements, progress, -} = Astro.props; +}: Props = Astro.props; const Element = link ? 'a' : 'div'; @@ -86,8 +87,8 @@ const footerEls = (footerElements ?? []).map((element: string) => { const hasHeader = header || headerTitle || headerTabs || headerPills; const hasFooter = footer || footerButton || footerButtons || footerElements; -const imgTopPhoto = (photos as { file: string; title: string }[])[7]; -const imgBottomPhoto = (photos as { file: string; title: string }[])[11]; +const imgTopPhoto = requireIndex(photos as { file: string; title: string }[], 7); +const imgBottomPhoto = requireIndex(photos as { file: string; title: string }[], 11); --- diff --git a/shared/components/cards/CardImage.astro b/shared/components/cards/CardImage.astro index 903ce51d5..0962cc1bb 100644 --- a/shared/components/cards/CardImage.astro +++ b/shared/components/cards/CardImage.astro @@ -1,5 +1,6 @@ --- import photos from '@data/photos.json' +import { requireIndex } from '@shared/lib/array' interface Props { title?: string @@ -9,7 +10,7 @@ interface Props { const { title, right, imgId = 1 } = Astro.props -const photo = (photos as { file: string; title: string }[])[imgId] +const photo = requireIndex(photos as { file: string; title: string }[], imgId) const imgClass = `w-100 h-100 object-cover ${right ? 'card-img-end' : 'card-img-start'}` --- diff --git a/shared/components/cards/CarouselCard.astro b/shared/components/cards/CarouselCard.astro index 0b2089c6c..6d7736c68 100644 --- a/shared/components/cards/CarouselCard.astro +++ b/shared/components/cards/CarouselCard.astro @@ -2,7 +2,6 @@ // Photos filtered to horizontal=true, then sliced by offset/limit. import photos from '@data/photos.json' import CardTitle from '@ui/CardTitle.astro' -import Carousel from '@ui/Carousel.astro' interface Props { id?: string diff --git a/shared/components/cards/ProjectProgress.astro b/shared/components/cards/ProjectProgress.astro index 021aa0c23..75047fd0f 100644 --- a/shared/components/cards/ProjectProgress.astro +++ b/shared/components/cards/ProjectProgress.astro @@ -2,6 +2,7 @@ import Progress from '@ui/Progress.astro' import CardDropdown from '@ui/CardDropdown.astro' import projects from '@data/projects.json' +import { requireIndex } from '@shared/lib/array' interface Project { title?: string @@ -16,7 +17,7 @@ interface Props { } const { projectId = 0, progress = 25, daysAgo = 2 } = Astro.props -const project = (projects as Project[])[projectId] +const project = requireIndex(projects as Project[], projectId) ---
diff --git a/shared/components/cards/Subscribe.astro b/shared/components/cards/Subscribe.astro index 762a5c99b..887d46054 100644 --- a/shared/components/cards/Subscribe.astro +++ b/shared/components/cards/Subscribe.astro @@ -2,6 +2,7 @@ import Avatar from '@ui/Avatar.astro' import CardDropdown from '@ui/CardDropdown.astro' import people from '@data/people.json' +import { requireIndex } from '@shared/lib/array' interface Person { full_name?: string @@ -15,7 +16,7 @@ interface Props { } const { personId = 0 } = Astro.props -const person = (people as Person[])[personId] +const person = requireIndex(people as Person[], personId) ---
diff --git a/shared/components/cards/UserCard.astro b/shared/components/cards/UserCard.astro index 09b89fc52..ad6f371ef 100644 --- a/shared/components/cards/UserCard.astro +++ b/shared/components/cards/UserCard.astro @@ -2,6 +2,7 @@ // person = people[person-id] (no -1: the object is passed straight to Avatar). import Avatar from '@ui/Avatar.astro' import people from '@data/people.json' +import { requireIndex } from '@shared/lib/array' interface Person { full_name?: string @@ -16,7 +17,7 @@ interface Props { } const { personId = 0, right } = Astro.props -const person = (people as Person[])[personId] +const person = requireIndex(people as Person[], personId) --- diff --git a/shared/components/cards/UserCardBg.astro b/shared/components/cards/UserCardBg.astro index bec5b7f4d..d377a0d13 100644 --- a/shared/components/cards/UserCardBg.astro +++ b/shared/components/cards/UserCardBg.astro @@ -3,6 +3,7 @@ import Avatar from '@ui/Avatar.astro' import people from '@data/people.json' import photos from '@data/photos.json' +import { requireIndex } from '@shared/lib/array' interface Person { full_name?: string @@ -22,8 +23,8 @@ interface Props { } const { personId = 0, blurred } = Astro.props -const person = (people as Person[])[personId] -const photo = (photos as Photo[])[personId] +const person = requireIndex(people as Person[], personId) +const photo = requireIndex(photos as Photo[], personId) --- diff --git a/shared/components/cards/UserCardBig.astro b/shared/components/cards/UserCardBig.astro index 4cf2f96b6..15c834b05 100644 --- a/shared/components/cards/UserCardBig.astro +++ b/shared/components/cards/UserCardBig.astro @@ -1,6 +1,7 @@ --- import Avatar from '@ui/Avatar.astro' import people from '@data/people.json' +import { requireIndex } from '@shared/lib/array' interface Person { full_name?: string @@ -14,7 +15,7 @@ interface Props { } const { personId = 0 } = Astro.props -const person = (people as Person[])[personId] +const person = requireIndex(people as Person[], personId) ---
diff --git a/shared/components/cards/UserInfo.astro b/shared/components/cards/UserInfo.astro index 44ef57e79..89833666a 100644 --- a/shared/components/cards/UserInfo.astro +++ b/shared/components/cards/UserInfo.astro @@ -3,6 +3,7 @@ import Icon from '@ui/Icon.astro' import Flag from '@ui/Flag.astro' import people from '@data/people.json' +import { requireIndex } from '@shared/lib/array' interface Person { university?: string @@ -21,7 +22,7 @@ interface Props { } const { title = 'Basic info', personId = 25 } = Astro.props -const person = (people as Person[])[personId - 1] +const person = requireIndex(people as Person[], personId - 1) ---
diff --git a/shared/components/cards/UsersList2.astro b/shared/components/cards/UsersList2.astro index 17150bcb2..ed2d81dcc 100644 --- a/shared/components/cards/UsersList2.astro +++ b/shared/components/cards/UsersList2.astro @@ -3,6 +3,7 @@ import Avatar from '@ui/Avatar.astro' import CardTitle from '@ui/CardTitle.astro' import people from '@data/people.json' import { randomNumber, timeagoLabel } from '@shared/lib/pseudo-random' +import { requireIndex } from '@shared/lib/array' interface Person { full_name?: string @@ -19,12 +20,12 @@ interface Props { const { limit = 10, offset = 0, title = 'Top users', class: className } = Astro.props -const colors = 'green,red,yellow,x,x'.split(',') -const statusLabels: Record = { green: 'Online', red: 'Busy', yellow: 'Away', x: 'Offline' } +const colors = ['green', 'red', 'yellow', 'x', 'x'] as const +const statusLabels: Record<(typeof colors)[number], string> = { green: 'Online', red: 'Busy', yellow: 'Away', x: 'Offline' } const rows = (people as Person[]).slice(offset, offset + limit).map((person, idx) => { const index = idx + 1 // forloop.index (1-based) - const status = colors[randomNumber(index + 5, 0, colors.length - 1)] + const status = requireIndex(colors, randomNumber(index + 5, 0, colors.length - 1)) return { person, status: status !== 'x' ? status : 'secondary', diff --git a/shared/components/cards/music/TrackInfo.astro b/shared/components/cards/music/TrackInfo.astro index fc04acb4b..8f264b602 100644 --- a/shared/components/cards/music/TrackInfo.astro +++ b/shared/components/cards/music/TrackInfo.astro @@ -1,5 +1,6 @@ --- import tracks from '@data/tracks.json' +import { requireIndex } from '@shared/lib/array' interface Props { trackId?: number @@ -7,13 +8,14 @@ interface Props { const { trackId = 5 } = Astro.props -const track = tracks[trackId] +const track = requireIndex(tracks, trackId) +const trackImage = requireIndex(track.album.images, 1) ---
- {track.name} + {track.name}
diff --git a/shared/components/cards/music/TracksList.astro b/shared/components/cards/music/TracksList.astro index 6f7c16fda..3d3cf8c8e 100644 --- a/shared/components/cards/music/TracksList.astro +++ b/shared/components/cards/music/TracksList.astro @@ -6,6 +6,7 @@ import ListGroup from '@ui/ListGroup.astro' import ListGroupItem from '@ui/ListGroupItem.astro' import tracks from '@data/tracks.json' import { millisecondsToMinutes } from '@shared/lib/string-format' +import { requireIndex } from '@shared/lib/array' const items = tracks.slice(0, 12) --- @@ -18,7 +19,7 @@ const items = tracks.slice(0, 12)
{index + 1}
- {track.name} + {track.name}
{track.name} diff --git a/shared/components/layout/HeaderActionsButtons.astro b/shared/components/layout/HeaderActionsButtons.astro index ae28a820b..a0dae8194 100644 --- a/shared/components/layout/HeaderActionsButtons.astro +++ b/shared/components/layout/HeaderActionsButtons.astro @@ -8,7 +8,7 @@ import ReportModalContent from '../modals/ReportModalContent.astro' interface Props { /** layout-navbar-overlap && layout-navbar-dark → the "New view" button is color="dark" */ - dark?: boolean + dark?: boolean | undefined } const { dark } = Astro.props diff --git a/shared/components/layout/HeaderProfile.astro b/shared/components/layout/HeaderProfile.astro index 37e23ffbd..9a57df632 100644 --- a/shared/components/layout/HeaderProfile.astro +++ b/shared/components/layout/HeaderProfile.astro @@ -4,8 +4,9 @@ import Icon from '@ui/Icon.astro' import Button from '@ui/Button.astro' import ButtonList from '@ui/ButtonList.astro' import people from '@data/people.json' +import { requireIndex } from '@shared/lib/array' -const person = people[3] +const person = requireIndex(people, 3) --- diff --git a/shared/components/layout/PageHeader.astro b/shared/components/layout/PageHeader.astro index eb155e9be..0a216360a 100644 --- a/shared/components/layout/PageHeader.astro +++ b/shared/components/layout/PageHeader.astro @@ -15,21 +15,21 @@ import HeaderUptime from './HeaderUptime.astro'; interface Props { /** page-header — the page title; without it the whole block is not rendered */ - title?: string; + title?: string | undefined; /** page-header-pretitle */ - pretitle?: string; + pretitle?: string | undefined; /** page-header-description */ - description?: string; + description?: string | undefined; /** page-header-actions — name of an include from layout/header-actions/, e.g. "buttons" */ - actions?: string; + actions?: string | undefined; /** page-header-class */ class?: string; /** page-header-icon */ icon?: string; /** page-header-file — name of an include from layout/headers/, e.g. "profile" */ - file?: string; + file?: string | undefined; /** layout-navbar-overlap && layout-navbar-dark → text-white on .page-header */ - textWhite?: boolean; + textWhite?: boolean | undefined; } const { title, pretitle, description, actions, class: className, icon, file, textWhite } = Astro.props; diff --git a/shared/components/marketing/SectionDivider.astro b/shared/components/marketing/SectionDivider.astro index de32b9064..d27017521 100644 --- a/shared/components/marketing/SectionDivider.astro +++ b/shared/components/marketing/SectionDivider.astro @@ -1,7 +1,7 @@ --- // Renders nothing unless divider is 'waves' or 'arc'. interface Props { - divider?: string + divider?: string | undefined } const { divider } = Astro.props diff --git a/shared/components/modals/AddTaskModalContent.astro b/shared/components/modals/AddTaskModalContent.astro index dd91fbdb8..0bb31ecbc 100644 --- a/shared/components/modals/AddTaskModalContent.astro +++ b/shared/components/modals/AddTaskModalContent.astro @@ -2,13 +2,14 @@ // selected ids "5,6,2,3" → people[id-1]. import people from '@data/people.json' import FormGroup from '@ui/FormGroup.astro' +import { requireIndex } from '@shared/lib/array' interface Person { id: string full_name: string } -const selectedPeople = ['5', '6', '2', '3'].map((idStr) => (people as Person[])[Number(idStr) - 1]) +const selectedPeople = ['5', '6', '2', '3'].map((idStr) => requireIndex(people as Person[], Number(idStr) - 1)) ---
diff --git a/shared/components/modals/ChangePasswordModalContent.astro b/shared/components/modals/ChangePasswordModalContent.astro index 40509470c..59e8771e9 100644 --- a/shared/components/modals/ChangePasswordModalContent.astro +++ b/shared/components/modals/ChangePasswordModalContent.astro @@ -60,8 +60,8 @@ import FormGroup from '@ui/FormGroup.astro' const strengthLevels = ['bg-danger', 'bg-danger', 'bg-danger', 'bg-warning', 'bg-info', 'bg-success'] const strengthLabels = ['Weak', 'Weak', 'Weak', 'Fair', 'Good', 'Strong'] strengthBar.className = `progress-bar ${strengthLevels[strength]}` - strengthBar.setAttribute('aria-valuetext', password ? strengthLabels[strength] : 'Empty') - strengthText.textContent = password ? strengthLabels[strength] : '' + strengthBar.setAttribute('aria-valuetext', password ? (strengthLabels[strength] ?? '') : 'Empty') + strengthText.textContent = password ? (strengthLabels[strength] ?? '') : '' }) } diff --git a/shared/components/navbar/Navbar.astro b/shared/components/navbar/Navbar.astro index 4e963f9b3..eda9bb1df 100644 --- a/shared/components/navbar/Navbar.astro +++ b/shared/components/navbar/Navbar.astro @@ -16,14 +16,14 @@ import NavbarSearch from './NavbarSearch.astro'; interface Props { hideSearch?: boolean; /** equivalent of the page-menu front matter (active menu entry), e.g. "dashboards.default" */ - pageMenu?: string; + pageMenu?: string | undefined; breakpoint?: string; - condensed?: boolean; - dark?: boolean; + condensed?: boolean | undefined; + dark?: boolean | undefined; transparent?: boolean; - overlap?: boolean; - sticky?: boolean; - hideBrand?: boolean; + overlap?: boolean | undefined; + sticky?: boolean | undefined; + hideBrand?: boolean | undefined; /** use the sample menu (menu-sample.json) instead of the real one */ sample?: boolean; /** 1-based index into people.json for the user menu avatar */ @@ -40,7 +40,7 @@ interface Props { /** no-op — see the fluid-search note above */ fluidSearch?: boolean; /** layout-navbar-class */ - class?: string; + class?: string | undefined; } // pageMenu is the front matter `page-menu` value; when a page has none, nothing diff --git a/shared/components/navbar/NavbarMenu.astro b/shared/components/navbar/NavbarMenu.astro index 21cda13e8..6bfe77b24 100644 --- a/shared/components/navbar/NavbarMenu.astro +++ b/shared/components/navbar/NavbarMenu.astro @@ -20,7 +20,7 @@ interface Level1 { interface Props { /** equivalent of the page-menu front matter, e.g. "dashboards.default" */ - pageMenu?: string + pageMenu?: string | undefined sample?: boolean hideIcons?: boolean longTitles?: boolean diff --git a/shared/components/navbar/NavbarSide.astro b/shared/components/navbar/NavbarSide.astro index 8a0e52a2c..3ce77dc14 100644 --- a/shared/components/navbar/NavbarSide.astro +++ b/shared/components/navbar/NavbarSide.astro @@ -11,7 +11,7 @@ interface Props { class?: string breakpoint?: string condensed?: boolean - personId?: number + personId?: number | undefined hideUsername?: boolean dark?: boolean showThemeToggle?: boolean diff --git a/shared/components/navbar/NavbarSideUser.astro b/shared/components/navbar/NavbarSideUser.astro index f661ecc50..f90f2d9ca 100644 --- a/shared/components/navbar/NavbarSideUser.astro +++ b/shared/components/navbar/NavbarSideUser.astro @@ -3,6 +3,7 @@ import Icon from '@ui/Icon.astro' import Avatar from '@ui/Avatar.astro' import people from '@data/people.json' +import { requireIndex } from '@shared/lib/array' interface Props { personId?: number @@ -12,7 +13,7 @@ interface Props { const { personId = 1, hideUsername = false, dark = false } = Astro.props -const person = people[personId - 1] +const person = requireIndex(people, personId - 1) --- diff --git a/shared/components/navbar/Sidebar.astro b/shared/components/navbar/Sidebar.astro index 9bdc1723e..7a6f23d6d 100644 --- a/shared/components/navbar/Sidebar.astro +++ b/shared/components/navbar/Sidebar.astro @@ -5,14 +5,14 @@ import NavbarSide from './NavbarSide.astro' import NavbarMenu from './NavbarMenu.astro' interface Props { - dark?: boolean + dark?: boolean | undefined breakpoint?: string /** layout-sidebar-end — navbar-end class */ - end?: boolean + end?: boolean | undefined /** layout-navbar-transparent — navbar-transparent class */ - transparent?: boolean + transparent?: boolean | undefined /** equivalent of the page-menu front matter (active menu entry), e.g. "layout.vertical" */ - pageMenu?: string + pageMenu?: string | undefined } const { dark = false, breakpoint = 'lg', end = false, transparent = false, pageMenu } = Astro.props diff --git a/shared/components/parts/Datagrid.astro b/shared/components/parts/Datagrid.astro index 2ea6c7cf7..d3ad43e68 100644 --- a/shared/components/parts/Datagrid.astro +++ b/shared/components/parts/Datagrid.astro @@ -6,6 +6,7 @@ import Icon from '@ui/Icon.astro' import Datagrid from '@ui/Datagrid.astro' import DatagridItem from '@ui/DatagridItem.astro' import people from '@data/people.json' +import { requireIndex } from '@shared/lib/array' interface Person { full_name?: string @@ -13,7 +14,7 @@ interface Person { [key: string]: unknown } -const creator = (people as Person[])[0] +const creator = requireIndex(people as Person[], 0) --- diff --git a/shared/layouts/BaseLayout.astro b/shared/layouts/BaseLayout.astro index f0c8a2259..d2717fd93 100644 --- a/shared/layouts/BaseLayout.astro +++ b/shared/layouts/BaseLayout.astro @@ -6,13 +6,13 @@ import PageScripts from '@shared/components/PageScripts.astro' import libs from '@tabler/core/libs.json' interface Props { - title?: string + title?: string | undefined /** Third-party libs from libs.json, e.g. ['apexcharts', 'jsvectormap'] */ - pageLibs?: string[] + pageLibs?: string[] | undefined /** Extra body classes, e.g. "layout-boxed" / "layout-fluid" */ - bodyClass?: string + bodyClass?: string | undefined /** dir="rtl" + RTL variants of the tabler/plugin stylesheets */ - rtl?: boolean + rtl?: boolean | undefined /** Relative asset base: '.' for root pages, '..' one level deep */ base?: string } diff --git a/shared/layouts/DefaultLayout.astro b/shared/layouts/DefaultLayout.astro index 934fabda9..38137c0a2 100644 --- a/shared/layouts/DefaultLayout.astro +++ b/shared/layouts/DefaultLayout.astro @@ -7,21 +7,21 @@ import PageHeader from '@shared/components/layout/PageHeader.astro' import Footer from '@shared/components/layout/Footer.astro' interface Props { - title?: string + title?: string | undefined /** Script/CSS library keys passed to BaseLayout */ pageLibs?: string[] /** page-header — the title in the page header */ - pageHeader?: string + pageHeader?: string | undefined /** page-header-file — renders a layout/headers/{file} component instead of the title block */ - pageHeaderFile?: string + pageHeaderFile?: string | undefined /** page-header-pretitle */ - pretitle?: string + pretitle?: string | undefined /** page-header-description */ - description?: string + description?: string | undefined /** page-header-actions, e.g. "buttons" */ - actions?: string + actions?: string | undefined /** page-menu from the front matter, e.g. "layout.vertical" — active menu entry */ - pageMenu?: string + pageMenu?: string | undefined /** layout-sidebar */ sidebar?: boolean /** layout-sidebar-dark */ diff --git a/shared/lib/chart-script.ts b/shared/lib/chart-script.ts index 7f86c380a..77e283533 100644 --- a/shared/lib/chart-script.ts +++ b/shared/lib/chart-script.ts @@ -108,7 +108,7 @@ export function chartStyle(opts: { id: string; data: ChartData }): string { * Chart.astro. This is data-driven (from our own charts.json, not user input), * same trust level as everything else here. */ -export function chartConfig(opts: { id: string; data: ChartData; height: number }): { config: Record; xFormatterExpr?: string } { +export function chartConfig(opts: { id: string; data: ChartData; height: number }): { config: Record; xFormatterExpr?: string | undefined } { const { id, data, height } = opts const type = data.type ?? 'bar' const series = data.series ?? [] diff --git a/shared/lib/pseudo-random.ts b/shared/lib/pseudo-random.ts index 8314701d3..1931e62b1 100644 --- a/shared/lib/pseudo-random.ts +++ b/shared/lib/pseudo-random.ts @@ -1,6 +1,8 @@ // Deterministic pseudo-random values seeded by a loop index, used to generate // stable-looking demo data (numbers, dates, "time ago" labels) without a real RNG. +import { requireIndex } from './array' + export function randomNumber(x: number, min = 0, max = 100, round = 0): number { let value = ((x * x * Math.PI * Math.E * (max + 1) * (Math.sin(x) / Math.cos(x * x))) % (max + 1 - min)) + min @@ -24,7 +26,7 @@ export function randomDate(x: number): Date { } export function randomItem(x: number, items: T[]): T { - return items[randomNumber(x, 0, items.length - 1)] + return requireIndex(items, randomNumber(x, 0, items.length - 1)) } /** A date up to `maxDays` days ago, formatted as "now" / "N day(s) ago". */ diff --git a/shared/lib/string-format.test.ts b/shared/lib/string-format.test.ts index c3a7d8cac..33ca91add 100644 --- a/shared/lib/string-format.test.ts +++ b/shared/lib/string-format.test.ts @@ -1,5 +1,6 @@ import { describe, expect, it } from 'vitest' import { capitalize, firstLetters, formatNumber, millisecondsToMinutes, parseCurrency, parsePercentage, pathSlug, roundTo, slugifyWord, sortBy, splitDropTrailingEmpty, ucFirst } from './string-format' +import { requireIndex } from './array' describe('capitalize', () => { it('uppercases the first char and lowercases the rest', () => { @@ -106,6 +107,6 @@ describe('sortBy', () => { it('does not mutate the input array', () => { const people = [{ last_name: 'Smith' }, { last_name: 'Adams' }] sortBy(people, (p) => p.last_name) - expect(people[0].last_name).toBe('Smith') + expect(requireIndex(people, 0).last_name).toBe('Smith') }) }) diff --git a/shared/tsconfig.json b/shared/tsconfig.json index de0ef84ab..770a6f689 100644 --- a/shared/tsconfig.json +++ b/shared/tsconfig.json @@ -1,5 +1,5 @@ { - "extends": "astro/tsconfigs/strict", + "extends": "astro/tsconfigs/strictest", "include": [ "**/*" ], diff --git a/shared/ui/AdvancedTable.astro b/shared/ui/AdvancedTable.astro index e7b0bdb3a..402e2383f 100644 --- a/shared/ui/AdvancedTable.astro +++ b/shared/ui/AdvancedTable.astro @@ -2,7 +2,7 @@ import BadgesList from './BadgesList.astro' import Icon from './Icon.astro' import { formatLongDate } from '@shared/lib/date-format' -import { randomNumber, randomItem, randomDate } from '@shared/lib/pseudo-random' +import { randomItem, randomDate } from '@shared/lib/pseudo-random' import Avatar from './Avatar.astro' import Button from './Button.astro' import ButtonList from './ButtonList.astro' @@ -10,11 +10,23 @@ import Pagination from './Pagination.astro' import people from '@data/people.json' import tableProperties from '@data/table-properties.json' import CaptureScript from '../components/CaptureScript.astro' +import { requireIndex } from '@shared/lib/array' interface Props { id?: string } +interface Person { + full_name?: string + city?: string + country?: string + [key: string]: unknown +} + +interface AdvancedTableProperties { + headers: { 'data-sort': string; 'name': string }[] +} + const { id: tableId = 'advanced-table' } = Astro.props const statuses = ['Active', 'Inactive', 'Requested'] @@ -22,12 +34,10 @@ const perPage = ['10', '20', '50', '100'] const categories = ['Agencies', 'Individual', 'Event', 'Ticket'] const tags = ['QTA,Event,Tickets,TODO', 'Event,Tickets', 'QTA,Event', 'Tickets'] -const headers = (tableProperties as Record)['advanced-table'].headers as { - 'data-sort': string - 'name': string -}[] +const advancedTable = (tableProperties as { 'advanced-table': AdvancedTableProperties })['advanced-table'] +const headers = advancedTable.headers -const rows = (people as Record[]).map((person, i) => { +const rows = (people as Person[]).map((person, i) => { const index = i + 1 const status = randomItem(index + 5, statuses) const itemTags = randomItem(index + 5, tags).split(',') @@ -36,8 +46,7 @@ const rows = (people as Record[]).map((person, i) => { return { person, index, status, itemTags, category, date } }) -const advancedTable = (tableProperties as Record)['advanced-table'] -const perPageDefault = perPage[1] +const perPageDefault = requireIndex(perPage, 1) ---
@@ -104,23 +113,23 @@ const perPageDefault = perPage[1] - + {person.full_name} - + {person.city}, {person.country} - {status === 'Active' ? Active : status === 'Inactive' ? Inactive : Requested} - {date} - + {status === 'Active' ? Active : status === 'Inactive' ? Inactive : Requested} + {date} + {itemTags.map((tag) => ( {tag} ))} - + {category}
@@ -137,7 +146,7 @@ const perPageDefault = perPage[1]
diff --git a/shared/ui/Avatar.astro b/shared/ui/Avatar.astro index f732ffa4d..bc580d6df 100644 --- a/shared/ui/Avatar.astro +++ b/shared/ui/Avatar.astro @@ -13,14 +13,14 @@ interface Props { src?: string placeholder?: string | undefined personId?: number - person?: Person + person?: Person | undefined link?: boolean dropdown?: boolean - size?: string + size?: string | undefined thumb?: boolean class?: string shape?: string - color?: string + color?: string | undefined square?: boolean status?: string statusText?: string diff --git a/shared/ui/AvatarList.astro b/shared/ui/AvatarList.astro index 73af935bd..ea98eb712 100644 --- a/shared/ui/AvatarList.astro +++ b/shared/ui/AvatarList.astro @@ -12,8 +12,8 @@ interface Person { } interface Props { - limit?: number - offset?: number + limit?: number | undefined + offset?: number | undefined stacked?: boolean /** avatar-list-{size} + forwarded to default Avatars */ size?: string diff --git a/shared/ui/BackgroundPattern.astro b/shared/ui/BackgroundPattern.astro index 37f75c27b..6f0d02879 100644 --- a/shared/ui/BackgroundPattern.astro +++ b/shared/ui/BackgroundPattern.astro @@ -14,7 +14,7 @@ interface Props { [key: string]: unknown } -const { pattern, color, size, as: Element = 'div', class: className, ...rest } = Astro.props +const { pattern, color, size, as: Element = 'div', class: className, ...rest }: Props = Astro.props --- diff --git a/shared/ui/Badge.astro b/shared/ui/Badge.astro index ada6979a0..3205b24c4 100644 --- a/shared/ui/Badge.astro +++ b/shared/ui/Badge.astro @@ -2,7 +2,6 @@ import Icon from './Icon.astro' import Avatar from './Avatar.astro' import people from '@data/people.json' -import { firstLetters } from '@shared/lib/string-format' interface Person { full_name?: string diff --git a/shared/ui/Button.astro b/shared/ui/Button.astro index e983bd668..08ce12ca3 100644 --- a/shared/ui/Button.astro +++ b/shared/ui/Button.astro @@ -12,7 +12,7 @@ interface Props { element?: 'a' | 'button' type?: 'button' | 'reset' | 'submit' id?: string - color?: string + color?: string | undefined outline?: boolean ghost?: boolean /** btn-{height} right after btn */ diff --git a/shared/ui/Card.astro b/shared/ui/Card.astro index afdf47f1b..c616dc7fc 100644 --- a/shared/ui/Card.astro +++ b/shared/ui/Card.astro @@ -11,7 +11,7 @@ interface Props { [key: string]: unknown } -const { as: Element = 'div', size, class: className, ...rest } = Astro.props +const { as: Element = 'div', size, class: className, ...rest }: Props = Astro.props --- diff --git a/shared/ui/CardHeader.astro b/shared/ui/CardHeader.astro index 04a1c1868..2b86c2ea3 100644 --- a/shared/ui/CardHeader.astro +++ b/shared/ui/CardHeader.astro @@ -10,10 +10,10 @@ interface Props { class?: string } -const { title, as: TitleTag = 'h3', light, class: className } = Astro.props +const { title, as: TitleTag = 'h3', light, class: className }: Props = Astro.props ---
- {title && {title}} + {title && {title}}
diff --git a/shared/ui/CardSubtitle.astro b/shared/ui/CardSubtitle.astro index 30e8471ea..24a73709d 100644 --- a/shared/ui/CardSubtitle.astro +++ b/shared/ui/CardSubtitle.astro @@ -7,7 +7,7 @@ interface Props { class?: string } -const { as: Tag = 'p', class: className } = Astro.props +const { as: Tag = 'p', class: className }: Props = Astro.props --- diff --git a/shared/ui/CardTitle.astro b/shared/ui/CardTitle.astro index 5ab7880e9..2276ead8a 100644 --- a/shared/ui/CardTitle.astro +++ b/shared/ui/CardTitle.astro @@ -8,9 +8,9 @@ interface Props { id?: string } -const { as: Tag = 'h3', class: className, id } = Astro.props +const { as: Tag = 'h3', class: className, id }: Props = Astro.props --- - + diff --git a/shared/ui/ChartSparkline.astro b/shared/ui/ChartSparkline.astro index 61e558651..e9aeb98a4 100644 --- a/shared/ui/ChartSparkline.astro +++ b/shared/ui/ChartSparkline.astro @@ -2,9 +2,9 @@ import CaptureScript from '../components/CaptureScript.astro'; interface Props { - id?: string; + id?: string | undefined; type?: string; - color?: string; + color?: string | undefined; height?: number; small?: boolean; wide?: boolean; diff --git a/shared/ui/Chat.astro b/shared/ui/Chat.astro index a738cfc3b..6106d913e 100644 --- a/shared/ui/Chat.astro +++ b/shared/ui/Chat.astro @@ -2,6 +2,7 @@ import Avatar from './Avatar.astro' import chats from '@data/chats.json' import people from '@data/people.json' +import { requireIndex } from '@shared/lib/array' interface Person { full_name?: string @@ -31,7 +32,7 @@ const peopleList = people as Person[]
{ messages.map((message) => { - const person = peopleList[message['person-id']] + const person = requireIndex(peopleList, message['person-id']) const me = message['person-id'] === 0 const messageColClass = message.loading ? 'col-auto' : `col${wide ? ' col-lg-6' : ''}` diff --git a/shared/ui/Empty.astro b/shared/ui/Empty.astro index 1d15e963e..6ed4f33ae 100644 --- a/shared/ui/Empty.astro +++ b/shared/ui/Empty.astro @@ -9,11 +9,11 @@ interface Props { bordered?: boolean class?: string /** illustration file name, e.g. "computer-fix.svg" */ - illustration?: string + illustration?: string | undefined /** icon-text param — big text rendered instead of an icon/illustration */ - iconText?: string + iconText?: string | undefined title?: string - subtitle?: string + subtitle?: string | undefined buttonText?: string buttonIcon?: string } diff --git a/shared/ui/Flag.astro b/shared/ui/Flag.astro index 65e5edebc..5fe69c583 100644 --- a/shared/ui/Flag.astro +++ b/shared/ui/Flag.astro @@ -1,6 +1,6 @@ --- interface Props { - flag?: string + flag?: string | undefined size?: string class?: string label?: string | undefined diff --git a/shared/ui/FormHint.astro b/shared/ui/FormHint.astro index 3d004f41e..d3ea9f7fe 100644 --- a/shared/ui/FormHint.astro +++ b/shared/ui/FormHint.astro @@ -6,12 +6,12 @@ interface Props { as?: string class?: string /** id so a control can reference the hint via aria-describedby */ - id?: string + id?: string | undefined } -const { as: Tag = 'div', class: className, id } = Astro.props +const { as: Tag = 'div', class: className, id }: Props = Astro.props --- - + diff --git a/shared/ui/Icon.astro b/shared/ui/Icon.astro index ea52ffe02..019e8cf74 100644 --- a/shared/ui/Icon.astro +++ b/shared/ui/Icon.astro @@ -4,8 +4,8 @@ import icons from '@data/icons.json' interface Props { name: string type?: 'outline' | 'filled' - class?: string - color?: string + class?: string | undefined + color?: string | undefined size?: string inline?: boolean } diff --git a/shared/ui/ListGroup.astro b/shared/ui/ListGroup.astro index d07d9d23a..039c82d29 100644 --- a/shared/ui/ListGroup.astro +++ b/shared/ui/ListGroup.astro @@ -12,7 +12,7 @@ interface Props { [key: string]: unknown } -const { as: Element = 'div', flush, hoverable, transparent, class: className, ...rest } = Astro.props +const { as: Element = 'div', flush, hoverable, transparent, class: className, ...rest }: Props = Astro.props --- diff --git a/shared/ui/ListGroupItem.astro b/shared/ui/ListGroupItem.astro index 4002b43ac..dcbab7501 100644 --- a/shared/ui/ListGroupItem.astro +++ b/shared/ui/ListGroupItem.astro @@ -13,7 +13,7 @@ interface Props { [key: string]: unknown } -const { as: Element = 'div', action, active, disabled, class: className, ...rest } = Astro.props +const { as: Element = 'div', action, active, disabled, class: className, ...rest }: Props = Astro.props --- diff --git a/shared/ui/Photo.astro b/shared/ui/Photo.astro index db62bab28..e052817d6 100644 --- a/shared/ui/Photo.astro +++ b/shared/ui/Photo.astro @@ -19,4 +19,4 @@ const { photo, background, ratio, class: className } = Astro.props const src = `./static/photos/${photo.file}` --- -{background ?
: ratio ?
: {photo.title}} +{background ?
: ratio ?
: {photo.title}} diff --git a/shared/ui/Progress.astro b/shared/ui/Progress.astro index e4bbdd265..05ec8cb29 100644 --- a/shared/ui/Progress.astro +++ b/shared/ui/Progress.astro @@ -1,10 +1,10 @@ --- interface Props { - value?: number | string + value?: number | string | undefined values?: (string | number)[] - color?: string + color?: string | undefined colors?: string[] - size?: string + size?: string | undefined class?: string width?: string id?: string diff --git a/shared/ui/ProgressDescription.astro b/shared/ui/ProgressDescription.astro index 7a9440b02..ee0e076a7 100644 --- a/shared/ui/ProgressDescription.astro +++ b/shared/ui/ProgressDescription.astro @@ -14,7 +14,7 @@ interface Props { const { label = 'Label', description, value, color = 'blue', size, class: className } = Astro.props --- -
+
{label}
{description &&
{description}
} diff --git a/shared/ui/Select.astro b/shared/ui/Select.astro index 5aa4f041e..28e3243ee 100644 --- a/shared/ui/Select.astro +++ b/shared/ui/Select.astro @@ -52,7 +52,7 @@ interface Person { } // Build the option list. -type Opt = { value: string; text: string; custom?: string; selected?: boolean }; +type Opt = { value: string; text: string; custom?: string | undefined; selected?: boolean }; type Group = { label: string; options: Opt[] }; let options: Opt[] = []; let optgroups: Group[] = []; diff --git a/shared/ui/Subheader.astro b/shared/ui/Subheader.astro index 76172eb4a..f94d8c1c1 100644 --- a/shared/ui/Subheader.astro +++ b/shared/ui/Subheader.astro @@ -9,7 +9,7 @@ interface Props { [key: string]: unknown } -const { as: Tag = 'div', class: className, ...rest } = Astro.props +const { as: Tag = 'div', class: className, ...rest }: Props = Astro.props --- diff --git a/shared/ui/Timeline.astro b/shared/ui/Timeline.astro index e4f87f0eb..ca321c4eb 100644 --- a/shared/ui/Timeline.astro +++ b/shared/ui/Timeline.astro @@ -4,6 +4,7 @@ import Icon from './Icon.astro' import Avatar from './Avatar.astro' import people from '@data/people.json' import photos from '@data/photos.json' +import { requireIndex } from '@shared/lib/array' interface Props { simple?: boolean @@ -13,6 +14,7 @@ const { simple } = Astro.props const avatarPeople = (people as { full_name?: string; photo?: string }[]).slice(0, 3) const timelinePhotos = photos as { file: string; title: string }[] +const timelinePhoto = (i: number) => requireIndex(timelinePhotos, i) ---
    @@ -78,15 +80,15 @@ const timelinePhotos = photos as { file: string; title: string }[]
    - {timelinePhotos[6].title} + {timelinePhoto(6).title}
    - {timelinePhotos[7].title} + {timelinePhoto(7).title}
    - {timelinePhotos[8].title} + {timelinePhoto(8).title}
diff --git a/shared/ui/Toast.astro b/shared/ui/Toast.astro index 017953326..188e09ee4 100644 --- a/shared/ui/Toast.astro +++ b/shared/ui/Toast.astro @@ -1,6 +1,7 @@ --- import Avatar from './Avatar.astro' import people from '@data/people.json' +import { requireIndex } from '@shared/lib/array' interface Props { toastId?: string @@ -21,7 +22,7 @@ interface Person { [key: string]: unknown } -const person = (people as Person[])[personId] +const person = requireIndex(people as Person[], personId) ---