Skip to content

Refactor: Extract getTableCellComponent helper for better reusability #2763

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鈥檒l occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
enjeck merged 1 commit into from
Aug 29, 2026
Merged

Refactor: Extract getTableCellComponent helper for better reusability #2763

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
40 changes: 40 additions & 0 deletions src/shared/components/ncTable/partials/TableCell.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,40 @@
/**
* SPDX-FileCopyrightText: 2026 Nextcloud GmbH and Nextcloud contributors
* SPDX-License-Identifier: AGPL-3.0-or-later
*/
import { ColumnTypes } from './../mixins/columnHandler.js'

import TableCellHtml from './TableCellHtml.vue'
import TableCellProgress from './TableCellProgress.vue'
import TableCellLink from './TableCellLink.vue'
import TableCellNumber from './TableCellNumber.vue'
import TableCellStars from './TableCellStars.vue'
import TableCellYesNo from './TableCellYesNo.vue'
import TableCellDateTime from './TableCellDateTime.vue'
import TableCellTextLine from './TableCellTextLine.vue'
import TableCellSelection from './TableCellSelection.vue'
import TableCellMultiSelection from './TableCellMultiSelection.vue'
import TableCellRelation from './TableCellRelation.vue'
import TableCellTextRich from './TableCellEditor.vue'
import TableCellUsergroup from './TableCellUsergroup.vue'

const COMPONENT_BY_COLUMN_TYPE = {
[ColumnTypes.TextLine]: TableCellTextLine,
[ColumnTypes.TextLink]: TableCellLink,
[ColumnTypes.TextRich]: TableCellTextRich,
[ColumnTypes.Number]: TableCellNumber,
[ColumnTypes.NumberStars]: TableCellStars,
[ColumnTypes.NumberProgress]: TableCellProgress,
[ColumnTypes.Selection]: TableCellSelection,
[ColumnTypes.SelectionMulti]: TableCellMultiSelection,
[ColumnTypes.SelectionCheck]: TableCellYesNo,
[ColumnTypes.Datetime]: TableCellDateTime,
[ColumnTypes.DatetimeDate]: TableCellDateTime,
[ColumnTypes.DatetimeTime]: TableCellDateTime,
[ColumnTypes.Usergroup]: TableCellUsergroup,
[ColumnTypes.Relation]: TableCellRelation,
}

export function getTableCellComponent(column) {
return COMPONENT_BY_COLUMN_TYPE[column?.type] || TableCellHtml
}
51 changes: 4 additions & 47 deletions src/shared/components/ncTable/partials/TableRow.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
'frozen-column--last': index === pinnedColumnIndex,
}"
@click="handleCellClick(col)">
<component :is="getTableCell(col)"
<component :is="getTableCellComponent(col)"
:column="col"
:row-id="row.id"
:value="getCellValue(col)"
Expand Down Expand Up @@ -68,20 +68,8 @@ import { NcCheckboxRadioSwitch, NcActions, NcActionButton } from '@nextcloud/vue
import ContentCopy from 'vue-material-design-icons/ContentCopy.vue'
import Pencil from 'vue-material-design-icons/PencilOutline.vue'
import TrashCanOutline from 'vue-material-design-icons/TrashCanOutline.vue'
import TableCellHtml from './TableCellHtml.vue'
import TableCellProgress from './TableCellProgress.vue'
import TableCellLink from './TableCellLink.vue'
import TableCellNumber from './TableCellNumber.vue'
import TableCellStars from './TableCellStars.vue'
import TableCellYesNo from './TableCellYesNo.vue'
import TableCellDateTime from './TableCellDateTime.vue'
import TableCellTextLine from './TableCellTextLine.vue'
import TableCellSelection from './TableCellSelection.vue'
import TableCellMultiSelection from './TableCellMultiSelection.vue'
import TableCellRelation from './TableCellRelation.vue'
import TableCellTextRich from './TableCellEditor.vue'
import TableCellUsergroup from './TableCellUsergroup.vue'
import { ColumnTypes, getColumnWidthStyle, getFrozenColumnStyle } from './../mixins/columnHandler.js'
import { getTableCellComponent } from './TableCell.js'
import { getColumnWidthStyle, getFrozenColumnStyle } from './../mixins/columnHandler.js'
import { translate as t } from '@nextcloud/l10n'
import {
TYPE_META_ID, TYPE_META_CREATED_BY, TYPE_META_CREATED_AT, TYPE_META_UPDATED_BY, TYPE_META_UPDATED_AT,
Expand All @@ -91,25 +79,12 @@ import activityMixin from '../../../mixins/activityMixin.js'
export default {
name: 'TableRow',
components: {
TableCellYesNo,
TableCellStars,
TableCellNumber,
TableCellLink,
TableCellProgress,
TableCellHtml,
NcActions,
NcActionButton,
ContentCopy,
Pencil,
TrashCanOutline,
NcCheckboxRadioSwitch,
TableCellDateTime,
TableCellTextLine,
TableCellSelection,
TableCellMultiSelection,
TableCellRelation,
TableCellTextRich,
TableCellUsergroup,
},

mixins: [activityMixin],
Expand Down Expand Up @@ -180,31 +155,13 @@ export default {
t,
getColumnWidthStyle,
getFrozenColumnStyle,
getTableCellComponent,
handleCellClick(column) {
// If the column type doesn't support inline editing, trigger the edit modal
if (this.nonInlineEditableColumnTypes.includes(column.type) && this.config.canEditRows) {
this.$emit('edit-row', this.row.id)
}
},
getTableCell(column) {
switch (column.type) {
case ColumnTypes.TextLine: return 'TableCellTextLine'
case ColumnTypes.TextLink: return 'TableCellLink'
case ColumnTypes.TextRich:return 'TableCellTextRich'
case ColumnTypes.Number: return 'TableCellNumber'
case ColumnTypes.NumberStars: return 'TableCellStars'
case ColumnTypes.NumberProgress: return 'TableCellProgress'
case ColumnTypes.Selection: return 'TableCellSelection'
case ColumnTypes.SelectionMulti: return 'TableCellMultiSelection'
case ColumnTypes.SelectionCheck: return 'TableCellYesNo'
case ColumnTypes.Relation: return 'TableCellRelation'
case ColumnTypes.Datetime: return 'TableCellDateTime'
case ColumnTypes.DatetimeDate: return 'TableCellDateTime'
case ColumnTypes.DatetimeTime: return 'TableCellDateTime'
case ColumnTypes.Usergroup: return 'TableCellUsergroup'
default: return 'TableCellHtml'
}
},
getCell(columnId) {
if (columnId < 0) {
// See metaColumns.js for mapping
Expand Down
Loading