Skip to content

fix(core): use NcChip for unified search tags #58991

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

Draft
skjnldsv wants to merge 1 commit into
base: master
Choose a base branch
from
+12 −28
Draft

fix(core): use NcChip for unified search tags #58991

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
23 changes: 4 additions & 19 deletions core/src/components/UnifiedSearch/SearchFilterChip.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,37 +3,22 @@
- SPDX-License-Identifier: AGPL-3.0-or-later
-->
<template>
<div class="chip">
<span class="icon">
<slot name="icon" />
<span v-if="pretext.length"> {{ pretext }} : </span>
</span>
<span class="text">{{ text }}</span>
<span class="close-icon" @click="deleteChip">
<CloseIcon :size="18" />
</span>
</div>
<NcChip :text="text"
@close="deleteChip">
<slot name="icon" />
</NcChip>
</template>

<script>
import CloseIcon from 'vue-material-design-icons/Close.vue'
export default {
name: 'SearchFilterChip',
components: {
CloseIcon,
},
props: {
text: {
type: String,
required: true,
},
pretext: {
type: String,
required: true,
},
},
methods: {
Expand Down
17 changes: 8 additions & 9 deletions core/src/components/UnifiedSearch/UnifiedSearchModal.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,24 +102,23 @@
</NcCheckboxRadioSwitch>
</div>
<div class="unified-search-modal__filters-applied">
<FilterChip
<NcChip
v-for="filter in filters"
:key="filter.id"
:text="filter.name ?? filter.text"
pretext=""
@delete="removeFilter(filter)">
@close="removeFilter(filter)">
<template #icon>
<NcAvatar
v-if="filter.type === 'person'"
:user="filter.user"
:size="24"
:size="22"
disable-menu
hide-user-status
:hide-favorite="false" />
<IconCalendarRange v-else-if="filter.type === 'date'" />
<img v-else :src="filter.icon" alt="">
<IconCalendarRange v-else-if="filter.type === 'date'" :size="18" />
<img v-else :src="filter.icon" height="18" width="18" alt="">
</template>
</FilterChip>
</NcChip>
</div>
</div>

Expand Down Expand Up @@ -208,6 +207,7 @@ import NcActions from '@nextcloud/vue/components/NcActions'
import NcAvatar from '@nextcloud/vue/components/NcAvatar'
import NcButton from '@nextcloud/vue/components/NcButton'
import NcCheckboxRadioSwitch from '@nextcloud/vue/components/NcCheckboxRadioSwitch'
import NcChip from '@nextcloud/vue/components/NcChip'
import NcDialog from '@nextcloud/vue/components/NcDialog'
import NcEmptyContent from '@nextcloud/vue/components/NcEmptyContent'
import NcInputField from '@nextcloud/vue/components/NcInputField'
Expand All @@ -220,7 +220,6 @@ import IconListBox from 'vue-material-design-icons/ListBox.vue'
import IconMagnify from 'vue-material-design-icons/Magnify.vue'
import CustomDateRangeModal from './CustomDateRangeModal.vue'
import SearchableList from './SearchableList.vue'
import FilterChip from './SearchFilterChip.vue'
import SearchResult from './SearchResult.vue'
import { unifiedSearchLogger } from '../../logger.js'
import { getContacts, getProviders, search as unifiedSearch } from '../../services/UnifiedSearchService.js'
Expand All @@ -238,11 +237,11 @@ export default defineComponent({
IconMagnify,

CustomDateRangeModal,
FilterChip,
NcActions,
NcActionButton,
NcAvatar,
NcButton,
NcChip,
NcEmptyContent,
NcDialog,
NcInputField,
Expand Down
Loading