Self-hosted personal gallery application with online photo management and albums, supporting Live/Motion Photos, EXIF parsing, geolocation recognition, and an explore map.
TypeScript albumsexif-extractiongeocodinglive-photomotion-photophoto-galleryphoto-sharingwebgl-viewer
fix(console): handle untitled photos and reaction overflow
HoshinoSuzumieea98e720463
diff --git a/packages/console/app/components/ConsolePhotoMasonry.vue b/packages/console/app/components/ConsolePhotoMasonry.vueindex a75a60d1..c55a34fc 100644--- a/packages/console/app/components/ConsolePhotoMasonry.vue+++ b/packages/console/app/components/ConsolePhotoMasonry.vue@@ -63,7 +63,7 @@ function selectAll(value: boolean | 'indeterminate') {<UCheckbox:id="`${selectionId}-${photo.id}`":model-value="!!selection[photo.id]"- :aria-label="`${$t('dashboard.photos.table.selectRowAria')} ${photo.title}`"+ :aria-label="`${$t('dashboard.photos.table.selectRowAria')} ${photo.title ?? photo.id}`"@update:model-value="selection[photo.id] = $event === true"/></label>@@ -73,7 +73,7 @@ function selectAll(value: boolean | 'indeterminate') {variant="outline"color="neutral"icon="tabler:dots-vertical"- :aria-label="`${$t('dashboard.photos.table.columns.actions')} ${photo.title}`"+ :aria-label="`${$t('dashboard.photos.table.columns.actions')} ${photo.title ?? photo.id}`"/></UDropdownMenu></div>diff --git a/packages/console/app/composables/usePhotoTableColumns.ts b/packages/console/app/composables/usePhotoTableColumns.tsindex d18c677a..b4758b0d 100644--- a/packages/console/app/composables/usePhotoTableColumns.ts+++ b/packages/console/app/composables/usePhotoTableColumns.ts@@ -225,6 +225,9 @@ export function usePhotoTableColumns(options: {.filter(([, count]) => (count as number) > 0).sort((a, b) => (b[1] as number) - (a[1] as number)).slice(0, 3)+ const hiddenReactions =+ totalReactions -+ topReactions.reduce((sum, [, count]) => sum + count, 0)return h('div',@@ -249,11 +252,11 @@ export function usePhotoTableColumns(options: {),]),),- totalReactions > topReactions.length+ hiddenReactions > 0? h('span',{ class: 'text-xs text-neutral-400' },- `+${totalReactions - topReactions.reduce((sum, [, count]) => sum + (count as number), 0)}`,+ `+${hiddenReactions}`,): null,].filter(Boolean),diff --git a/tests/photo-table-presentation.test.ts b/tests/photo-table-presentation.test.tsindex 69ec2a1e..a60ba419 100644--- a/tests/photo-table-presentation.test.ts+++ b/tests/photo-table-presentation.test.ts@@ -3,10 +3,17 @@ import { readFileSync } from 'node:fs'import test from 'node:test'import vm from 'node:vm'import ts from 'typescript'-import { computed, h, ref } from 'vue'+import { computed, h, ref, type Ref, type VNode } from 'vue'++interface TestColumn {+ id?: string+ accessorKey?: string+ cell: (context: unknown) => VNode+}+const childrenOf = (node: VNode) => node.children as VNode[]test('shared photo columns render empty metadata and reaction breakdowns consistently', () => {- const exports: Record<string, any> = {}+ const exports: Record<string, unknown> = {}vm.runInNewContext(ts.transpileModule(readFileSync(@@ -31,37 +38,47 @@ test('shared photo columns render empty metadata and reaction breakdowns consist)let previewed: unknownconst reactions = ref<Record<string, Record<string, number>>>({})- const columns = exports.usePhotoTableColumns({+ const createColumns = exports.usePhotoTableColumns as (options: {+ preview: (photo: unknown) => void+ reactions: Ref<Record<string, Record<string, number>>>+ }) => { value: TestColumn[] }+ const columns = createColumns({preview: (photo: unknown) => {previewed = photo},reactions,}).valueconst photo = { id: 'p', title: 'Photo', tags: [], exif: {} }- const render = (id: string) =>- columns- .find((c: any) => (c.id ?? c.accessorKey) === id)- .cell({- row: { original: photo },- getValue: () => null,- })+ const render = (id: string) => {+ const column = columns.find((c) => (c.id ?? c.accessorKey) === id)+ assert(column, id)+ return column.cell({ row: { original: photo }, getValue: () => null })+ }for (const [column, key] of [['tags', 'noTags'],['rating', 'noRating'],['isLivePhoto', 'staticPhoto'],]) {- const child = render(column).children[0]+ const child = childrenOf(render(column))[0]assert.equal(child.children, `dashboard.photos.table.cells.${key}`)- assert.match(child.props.class, /text-neutral-400 text-xs/)+ assert.match(String(child.props?.class), /text-neutral-400 text-xs/)}assert.equal(render('reactions').children,'dashboard.photos.table.cells.noReactions',)reactions.value = { p: { like: 3, love: 1 } }- const reactionCells = render('reactions').children- assert.equal(reactionCells[0].children[1].children, '3')- assert.equal(reactionCells[1].children[1].children, '1')- render('thumbnailUrl').props.onClick()+ const reactionCells = childrenOf(render('reactions'))+ assert.equal(reactionCells.length, 2)+ assert.equal(childrenOf(reactionCells[0])[1].children, '3')+ assert.equal(childrenOf(reactionCells[1])[1].children, '1')+ reactions.value = { p: { like: 5, love: 4, wow: 3 } }+ assert.equal(childrenOf(render('reactions')).length, 3)+ reactions.value = { p: { like: 5, love: 4, wow: 3, fire: 2, sad: 1 } }+ const overflow = childrenOf(render('reactions'))+ assert.equal(overflow.length, 4)+ assert.equal(overflow[3].children, '+3')+ const onPreview = render('thumbnailUrl').props?.onClick as () => void+ onPreview()assert.equal(previewed, photo)})