Skip to content

fix: it is not possible to clear non-mandatory selects during inline edit #2283

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

Open
Koc wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix: it is not possible to clear non-mandatory selects during inline edit #2283

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
2 changes: 1 addition & 1 deletion src/shared/components/ncTable/partials/TableCellMultiSelection.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,10 +20,10 @@
<NcSelect v-model="editValues"
:tag-width="80"
:options="getAllNonDeletedOrSelectedOptions"
:clearable="!column.mandatory"
:multiple="true"
:aria-label-combobox="t('tables', 'Options')"
:disabled="localLoading || !canEditCell()"
:clearable="true"
style="width: 100%;" />
<div v-if="localLoading" class="loading-indicator">
<div class="icon-loading-small icon-loading-inline" />
Expand Down
1 change: 1 addition & 0 deletions src/shared/components/ncTable/partials/TableCellSelection.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
@keydown.escape.stop="cancelEdit">
<NcSelect v-model="editValue"
:options="getAllNonDeletedOptions"
:clearable="!column.mandatory"
:aria-label-combobox="t('tables', 'Options')"
:disabled="localLoading || !canEditCell()"
style="width: 100%;" />
Expand Down
1 change: 1 addition & 0 deletions src/shared/components/ncTable/partials/TableCellUsergroup.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@
style="width: 100%;"
:loading="loading || localLoading"
:options="options"
:clearable="!column.mandatory"
:placeholder="getPlaceholder()"
:searchable="true"
:get-option-key="(option) => option.key"
Expand Down
1 change: 1 addition & 0 deletions src/shared/components/ncTable/partials/rowTypePartials/SelectionForm.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
<NcSelect
v-model="localValue"
:options="getAllNonDeletedOptions"
:clearable="!column.mandatory"
:disabled="column.viewColumnInformation?.readonly"
:aria-label-combobox="t('tables', 'Options')" />
</RowFormWrapper>
Expand Down
1 change: 1 addition & 0 deletions src/shared/components/ncTable/partials/rowTypePartials/SelectionMultiForm.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
v-model="localValues"
:tag-width="80"
:options="getAllNonDeletedOrSelectedOptions"
:clearable="!column.mandatory"
:disabled="column.viewColumnInformation?.readonly"
:multiple="true"
:aria-label-combobox="t('tables', 'Options')" />
Expand Down
5 changes: 4 additions & 1 deletion src/shared/components/ncTable/partials/rowTypePartials/UsergroupForm.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,11 @@
:placeholder="getPlaceholder()" :searchable="true" :get-option-key="(option) => option.key"
label="displayName" :aria-label-combobox="getPlaceholder()"
:user-select="true"
:clearable="!column.mandatory"
:disabled="column.viewColumnInformation?.readonly"
:close-on-select="false" :multiple="column.usergroupMultipleItems" data-cy="usergroupRowSelect"
:close-on-select="false"
:multiple="column.usergroupMultipleItems"
data-cy="usergroupRowSelect"
@search="asyncFind" @input="addItem">
<template #noResult>
{{ noResultText }}
Expand Down
23 changes: 10 additions & 13 deletions src/shared/components/ncTable/sections/CustomTable.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,11 @@
</template>
</NcButton>
<div class="page-number">
<NcSelect v-model="pageNumber" :options="allPageNumbersArray" :aria-label-combobox="t('tables', 'Page number')">
<NcSelect
v-model="pageNumber"
:options="allPageNumbersArray"
:clearable="false"
:aria-label-combobox="t('tables', 'Page number')">
<template #selected-option-container="{ option }">
<span class="selected-page">
{{ option.label }} of {{ totalPages }}
Expand Down Expand Up @@ -90,7 +94,7 @@ import { NcButton, useIsMobile, NcSelect } from '@nextcloud/vue'
import { mapState } from 'pinia'
import {
TYPE_META_ID, TYPE_META_CREATED_BY, TYPE_META_CREATED_AT, TYPE_META_UPDATED_BY, TYPE_META_UPDATED_AT,
} from '../../../../shared/constants.ts'
} from '../../../constants.ts'
import { MetaColumns } from '../mixins/metaColumns.js'
import { translate as t } from '@nextcloud/l10n'
import { useTablesStore } from '../../../../store/store.js'
Expand Down Expand Up @@ -408,17 +412,6 @@ export default {
</style>

<style lang="scss" scoped>
:deep(.vs__clear) {
display: none;
}

:deep(.v-select) {
min-width: 95px !important;
.vs__dropdown-toggle {
background: none;
}
}

:deep(.text-editor__wrapper .paragraph-content:last-child) {
margin-bottom: 0!important;
}
Expand Down Expand Up @@ -462,6 +455,10 @@ export default {
display: flex;
justify-content: center;
align-items: center;

:deep(.v-select) {
min-width: 95px !important;
}
}

:deep(table) {
Expand Down
Loading